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

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

 cloud-server-other/src/main/java/com/dsh/other/service/ISiteService.java

@@ -101,4 +101,7 @@

    Object changeState(SiteChangeStateVO vo);

    String getSMIDByOperatorId(Integer id);
    String getmerchantNumberByOperatorId(Integer id);

}