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

无关风月

昨天 2b2e8603381d62b5da4a817710b33d583561ff3f

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

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

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

    String getmerchantNumberAliByOperatorId(Integer id);
}