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

liyong

3 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

 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;
}