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

mitao

2025-03-31 060b84c46d7097696504aea89f77185320815b07

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

}