Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

3 天以前 f05fd2a067d751333f00a81dad095a7650900c95

 src/main/java/com/ruoyi/sales/pojo/CommonFile.java

@@ -28,7 +28,7 @@
    private String url;

    /** 关联表 */
    private String type;
    private Integer type;

    /** 创建时间 */
    @TableField(fill = FieldFill.INSERT)