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

无关风月

2025-03-28 8064549857d1cbfc9e7b80024f666a3b006ed3e0

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

@@ -102,5 +102,6 @@
    Object changeState(SiteChangeStateVO vo);

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

}