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

无关风月

2025-04-11 9a60b1e59f52ab4f41e956a76eac1150f39843e3

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

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