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

无关风月

3 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-other/src/main/java/com/dsh/other/mapper/SiteMapper.java

@@ -51,4 +51,5 @@
    String getSMIDByOperatorId(@Param("id")Integer id);
    String getmerchantNumberByOperatorId(@Param("id")Integer id);

    String getmerchantNumberAliByOperatorId(@Param("id")Integer id);
}