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

2 years ago · de758b0fce
parent b0d1ddda6c f75b8fdd86
commit de758b0fce
2 changed files with 6 additions and 0 deletions
--- a/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java
+++ b/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java
@ -30,6 +30,11 @@ public class InvPreinProductResponse {
     */
    private String ggxh;

+    /*
+    * 计量单位
+    * */
+    private String measname;
+
    /**
     * 批次号
     */
--- a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml
@ -7,6 +7,7 @@
               bp.cpmctymc,
               ipp.relIdFk,
               bp.ggxh,
+               bp.measname,
               ipp.batchNo,
               ipp.productionDate,
               ipp.expireDate,