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

luofl

2025-04-11 2fc4d1e0a7d1e786c99f3d113ac4449be2659c3f

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

@@ -49,5 +49,6 @@
    List<TSiteDTO> listExipre(@Param("query") ExpireSiteSearchVO vo);

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

}