Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

2026-04-14 91e0a57a7dbbbf0d3ae0c484238fb289fb432252

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

@@ -80,4 +80,7 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;


    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}