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

buhuazhen

8 天以前 306a7bb0c562a97b52bbc411774303ccf5f07374

 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;

}