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

mitao

2025-03-31 060b84c46d7097696504aea89f77185320815b07

 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;
    /**
     * 省
     */
@@ -94,4 +96,6 @@
     * 添加时间
     */
    private Date insertTime;

    private String operator;
}