Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-10 23ea8ee10fac0ee12d6f2be822c8d6af4c13e330

 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;