Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

3 天以前 8a71194e0cd81a39637bc9c5adbd8c9d1405f155

 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)