Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3

yifu-auth/src/main/java/com/yifu/cloud/plus/v1/yifu/auth/config/CASproperties.java

@@ -5,12 +5,12 @@ public class CASproperties {
 	/**
 	 * 当前应用程序的登陆界面
 	 */
-	public static String CLIENT_LOGIN_PAGE = "http://mvp.wanxinwork.com/login";
+	public static String CLIENT_LOGIN_PAGE = "https://qas-mvp-1.worfu.com/login";
 
 	/**
 	 * CAS服务器地址
 	 */
-	public static String CAS_SERVER_PATH = "http://192.168.0.240:8443/cas";
+	public static String CAS_SERVER_PATH = "http://192.168.1.62:8443/cas";
 
-	public static String SPRING_SECURITY_CAS_SERVER = "http://192.168.0.240:8443/cas/v1/tickets";
+	public static String SPRING_SECURITY_CAS_SERVER = "http://192.168.1.62:8443/cas/v1/tickets";
 }

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/controller/UserController.java

@@ -196,7 +196,7 @@ public class UserController {
 	@PutMapping
 	@PreAuthorize("@pms.hasPermission('sys_user_edit')")
 	public R<Boolean> updateUser(@Valid @RequestBody UserDTO userDto) {
-		userDto.setType(CommonConstants.ZERO_STRING);
+		///userDto.setType(CommonConstants.ZERO_STRING); 2023-04-07 fxj 解决变更LDAP 用户的问题
 		return R.ok(userService.updateUser(userDto));
 	}