Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java

@@ -185,7 +185,8 @@ public class SysWorkplaceDocumentEntity {
     private Integer shipper;
 
     /**
-     * 收货方1:原始单据的收货方 2:原始单据的发货方 3:供应商,4:客户,5:特殊往来,6:内部科室,7填写
+     * 收货方5:原始单据的收货方 6:原始单据的发货方 2:供应商,1:客户,4:特殊往来,3:内部科室,7填写
+     * 以本备注为准!!!!!!
      */
     @TableField(value = "consignee")
     private Integer consignee;

src/main/java/com/glxp/api/res/inv/InvProductResponse.java

@@ -230,5 +230,6 @@ public class InvProductResponse {
      */
     @TableField(value = "medicareType")
     private Integer medicareType;
+    private String packUnit;
 
 }

src/main/resources/mybatis/mapper/inv/InvProductNewDao.xml

@@ -31,6 +31,7 @@
         bp.productsType,
         bp.levelUnit,
         bp.prepnUnit,
+        bp.packUnit,
         bp.prepnSpec,
         bp.specialCode,
         bp.storageCondition,

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -51,6 +51,7 @@
                bp.basicPrductRemak6,
                bp.basicPrductRemak7,
                bp.basicPrductRemak8,
+               bp.packUnit,
                ip.price
         from inv_product ip
                      inner join basic_udirel on ip.relIdFk = basic_udirel.id