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

无关风月

2025-08-19 e8f01399a49bb718f184e31d0f6de27c3dc64cef

 cloud-server-other/src/main/java/com/dsh/other/service/IOperatorUserService.java

@@ -13,5 +13,7 @@
 */
public interface IOperatorUserService extends IService<OperatorUser> {

    List<Map<String, Object>> listAll(Page<Map<String, Object>> page, String province, String city, String userName, String phone, Integer platform, Integer type, Integer state);

    String getmerchantNumberByOperatorId(Integer operatorId);

}