From d20dbd5d97b3f418533d5d23fd337cdec9f95939 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 十二月 2023 09:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorUserController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..de62eb5 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
@@ -76,7 +76,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 +96,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