Merge remote-tracking branch 'origin/master'

于杰

2025-08-01 37175875537a92930a19688ad1cc2c49fb415f0f

 north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java

@@ -20,6 +20,7 @@
    private  String createTime;
    private  String updateTime;
    private  Integer state;
    private  String optimizeParms;
    @TableField(select = false,exist = false)
    private  List<UserRole> userRoleList;