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

puzhibing

2024-03-04 135aeb3706b445d6d1a937168a0fe781cf3060a8

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

@@ -35,7 +35,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    private String city;
    private String  province;
    private String province;
    private String name;
    private String phone;
    private Integer type;