Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-10 9e3ba891ab4439760d33ff5c12b7405273d0ed95

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

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