Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-17 464e2819756afef1228aaa7732c6ae8028be32a1

 flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java

@@ -264,6 +264,10 @@
    private String mattersIds;


    @ApiModelProperty("部门ids")
    private String departmentIds;


    @TableField(exist = false)
    @ApiModelProperty("办理事项名称")
    private String mattersNames;