Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 14fbe95ee5c7f601da703614f7e1e4a8ec29c8ce

 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;
}