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

jiangping

2024-10-17 14b70bacd63f6b136612cf70b160777142e2a996

 server/service/src/main/java/com/doumee/dao/business/model/GoodsImport.java

@@ -44,18 +44,8 @@
    @ExcelColumn(name="入手价",value = "price")
    private String price;

    @ExcelColumn(name="属性1",value = "attrFirstNames")
    private String attrFirstNames;

    @ExcelColumn(name="属性2",value = "attrSecodNames")
    private String attrSecodNames;

    @ExcelColumn(name="产品参数",value = "产品参数")
    private String paramStr;






}