Merge remote-tracking branch 'origin/master'

liujie

2023-08-09 b38caa7012b8da89d5ca61d389258d4fd8d9172e

 cloud-server-account/src/main/java/com/dsh/account/entity/UserIntegral.java

@@ -33,7 +33,7 @@
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private Long id;
    private String city;
    private String  province;
    private String name;