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

maven

6 天以前 5b83294fac4605b569a5a0d1c5e0f310026d10d4

 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;

}