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

mitao

2025-03-31 060b84c46d7097696504aea89f77185320815b07

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

@@ -48,4 +48,7 @@

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

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

}