Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/erp/SmErpUnitWithSpuVo.java

@@ -21,7 +21,7 @@ public class SmErpUnitWithSpuVo {
      * 自编码/条码
      */
     @Schema(description = "自编码/条码")
-    private String barcode;
+    private String barCode;
 
     /**
      * 商品封面图
@@ -63,8 +63,8 @@ public class SmErpUnitWithSpuVo {
     /**
      * 条码
      */
-    @Schema(description = "条码")
-    private String barCode;
+//    @Schema(description = "条码")
+//    private String barCode;
 
     /**
      * 规格

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml

@@ -46,7 +46,7 @@
     <select id="getSupermarketUnitsWithSpu" resultMap="SupermarketUnitWithSpuVoMap">
           SELECT u.id,
                  s.product_code,
-                 s.barcode,
+                 s.barCode,
                  s.pic_url,
                  s.product_name,
                  s.unit,