From 71609e40ba719ff40c27bb00d7f5f4af521a80e2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 26 四月 2024 08:52:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
index 5cc283c..88000f3 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/user/UserCtrl.java
@@ -45,7 +45,6 @@
* @return 榛樿瀵嗙爜
*/
@GetMapping(path = "defaultPassword")
- @Log("瀹㈡埛绔姹傚緱鍒伴粯璁ゅ瘑鐮�")
public BaseResponse<String> defaultPassword(){
if(defaultTrueRandomFalsePassword){
return BaseResponseUtils.buildSuccess(defaultPassword) ;
@@ -62,7 +61,7 @@
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
//@SsoAop() //鍙湁鐧诲綍楠岃瘉锛屾病鏈夋潈闄愰獙璇�
@SsoPowerAop(power = "10100010") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
- @Log("鍒嗛〉鏌ヨ鐢ㄦ埛")
+ @Log("鏌ヨ鐢ㄦ埛")
public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody QueryVo vo) {
try {
QueryResultVo<List<BaUser>> res = this.sv.selectSome(vo);
@@ -208,7 +207,7 @@
}
}
} catch (Exception e) {
- log.error("淇濆瓨鐢ㄦ埛寮傚父", e);
+ log.error("淇敼瀵嗙爜寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
if (count <= 0) {
--
Gitblit v1.8.0