Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -196,6 +196,10 @@
                t.wh_id,
                 tmw.wh_name
         ,ul.decimal_places    as "decimalPlaces"
+        ,t.unit_id
+        ,t.sub_unit_id
+        ,ul.unit_name as "unitName"
+        ,u2.unit_name as "subUnitName"
         FROM dkic_b.t_psi_order_item as t
                  inner join dkic_b.t_mst_goods_sku tmgs on t.sku_id = tmgs.sku_id
                  LEFT JOIN dkic_b.t_mst_unit AS ul ON tmgs.unit_id = ul.unit_id

src/main/java/com/dk/mdm/model/response/sale/OrderItemResponse.java

@@ -359,6 +359,14 @@ public class OrderItemResponse extends PageInfo<OrderItemResponse> implements Se
     @TableField(exist = false)
     private Integer decimalPlaces;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "计量单位")
+    private String unitName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "辅助单位")
+    private String subUnitName;
+
     private static final long serialVersionUID = 1L;
 
 }