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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 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")