Merge remote-tracking branch 'origin/master'

jiangping

2024-08-01 2831757b45ae0b84d79f42836f742cd1a1a9f97b

 server/service/src/main/java/com/doumee/dao/admin/request/ShopImport.java

@@ -30,4 +30,6 @@
    private String parentOrgId;
    @ExcelColumn(name="品类编码",value = "品类编码",index = 9)
    private String unitCode;
    @ExcelColumn(name="SCODE",value = "SCODE",index = 10)
    private String scode;
}