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

buhuazhen

昨天 e19b7b5d6b4a7658a7e172527017052a68b49f4d

 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)