Merge remote-tracking branch 'origin/dev_tide_cbsglxt' into dev_tide_cbsglx...

zouyu

2026-01-10 02f6d9e4d4f18060c41a7ea891c4c20adf92f335

 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)