Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂

gongchunyi

2026-07-07 72a32c227fdf10f34fe563a7de35169da5729eea

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

@@ -60,7 +60,6 @@
    private String remark;

    @Schema(description = "创建时间")
    @TableField(fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @Schema(description = "创建用户")