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

无关风月

9 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

 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);

}