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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

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

@@ -13,6 +13,7 @@
    private Integer id;
    private String name;
    private String phone;
    @TableField(exist = false)
    private String password;
    private String province;
    @TableField("provinceCode")