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

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

@@ -108,4 +108,9 @@ public class InvProductResponse {
      */
     private String invCode;
 
+    //    货位编号
+    private String invSpaceCode;
+
+    private String code;
+
 }

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

@@ -23,7 +23,9 @@
                auth_warehouse.name             invName,
                as.name                         spaceName,
                ipp.deptCode,
-               ipp.invCode
+               ipp.invCode,
+               ipp.invSpaceCode,
+               ipp.code as code
         from inv_product_detail ipp
                      inner join basic_udirel on ipp.relId = basic_udirel.id
                      inner join basic_products bp on basic_udirel.uuid = bp.uuid