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

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

@@ -48,4 +48,8 @@

    List<TSiteDTO> listExipre(@Param("query") ExpireSiteSearchVO vo);

    String getSMIDByOperatorId(@Param("id")Integer id);
    String getmerchantNumberByOperatorId(@Param("id")Integer id);

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