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

无关风月

2025-08-22 f38d69d70e3e126d2f58971d0b4854f2aa144fc1

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

@@ -49,5 +49,7 @@
    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);
}