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

buhuazhen

6 天以前 3138e373e0c9c7eb5e0b0847ef16a7753c4fc170

 src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java

@@ -29,4 +29,8 @@
    @TableField(exist = false)
    private List<CommonFile> commonFileList;

    private String  specificationModel;

    private String productName;

}