Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-08 fe8ffe15cba48fa5d8ab14d772b4c1fc276b47fd

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

@@ -34,7 +34,7 @@
    @ApiModelProperty(name = "userId", value = "主键用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    @TableId(value = "user_id", type = IdType.AUTO)
    private Long userId;
    private String userId;

    /**
     * 登录账户