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

zss

2026-05-22 222685a758d615ef69d8dafd5bcf0c270d6d0fb2

 src/main/java/com/ruoyi/projectManagement/pojo/ShippingAddress.java

@@ -79,4 +79,7 @@

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

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