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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java

@@ -39,9 +39,11 @@
     */
    private String siteTypeName;
    /**
     * 城市管理员id
     * 城市管理员id 弃用了
     */
    private Integer cityManagerId;
    // 运营商id
    private Integer operatorId;
    /**
     * 省
     */