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

mitao

2025-04-01 5af799118134eb1f77bb310433825fe7cf11e680

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

}