From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
index b4478f1..6f35ce3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java
@@ -68,7 +68,6 @@
}
-
/**
* 获取运营商列表
*/
@@ -76,7 +75,8 @@
@ResponseBody
public Object listAll(String province,String city,String userName, String phone,Integer platform,Integer type,Integer state) {
- List<Map<String,Object>> list = operatorUserService.listAll(new Page<>(),province,city,userName,phone,platform,type,state);
+ List<OperatorUserVO> list = operatorUserService.
+ listAll(province,city,userName,phone,platform,type,state);
return list;
}
@@ -95,7 +95,6 @@
String uboIcFront,String uboIcBack, String uboIcAddress) {
MgtShopAuthDto mgtShopAuthDto = new MgtShopAuthDto();
Integer userId = Objects.requireNonNull(UserExt.getUser()).getId();
-
mgtShopAuthDto.setUserId(userId);
mgtShopAuthDto.setAuthId("1");
mgtShopAuthDto.setShopId(Long.valueOf(operatorId));
--
Gitblit v1.7.1