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

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -233,6 +233,7 @@ public class UdiRelevanceResponse {
     private Date indate;
     private Integer majorType;
     private Integer medicareType;
+    private String productPrice;
 
     private String distributeLevelDi;
     private String distributeLevelUnit;

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -334,6 +334,18 @@
                basic_products.mjfs,
                basic_products.categoryName,
                basic_products.bzgg,
+               basic_products.levelUnit,
+               basic_products.prepnUnit,
+               basic_products.prepnSpec,
+               basic_products.storageCondition,
+               basic_products.transportCondition,
+               basic_products.indate,
+               basic_products.packMatrial,
+               basic_products.majorStatus,
+               basic_products.majorType,
+               basic_products.physicType,
+               basic_products.medicareType,
+               basic_products.price as productPrice,
                company_product_relevance.unitFk,
                basic_corp.erpId  as customerId,
                basic_corp.name      companyName,