Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 726c2e196bac6e56f588736c68b07a933dabb127

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

@@ -42,6 +42,7 @@
     */
    @ApiModelProperty("用户id")
    @JsonSerialize(using = ToStringSerializer.class)
    @JsonFormat(shape =JsonFormat.Shape.STRING )
    private Long userId;