fix some thing

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -494,7 +494,7 @@ public class MotanUserServiceImpl implements UserMotanService {
     xUserSpouse.setSpouseName(userSpouse.getSpouseName());
     xUserSpouse.setCreatedAt(userSpouse.getCreatedAt());
     xUserSpouse.setUpdateAt(userSpouse.getUpdateAt());
-    xUserSpouse.setStatus(cn.quantgroup.motan.enums.MaritalStatus.valueOf(userSpouse.getStatus().name()));
+    xUserSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(userSpouse.getStatus().name()));
     return xUserSpouse;
   }
 
@@ -528,10 +528,10 @@ public class MotanUserServiceImpl implements UserMotanService {
     if (xUserSpouse.getUserId() == null || xUserSpouse.getUserId() == 0) {
       return returnErrorValue("用户不能为空");
     }
-    cn.quantgroup.motan.enums.MaritalStatus status = xUserSpouse.getStatus();
+    cn.quantgroup.user.enums.MaritalStatus status = xUserSpouse.getStatus();
     String spousePhone = xUserSpouse.getSpousePhone();
     String spouseName = xUserSpouse.getSpouseName();
-    if (xUserSpouse.getStatus() == cn.quantgroup.motan.enums.MaritalStatus.MARRIED) {
+    if (xUserSpouse.getStatus() == cn.quantgroup.user.enums.MaritalStatus.MARRIED) {
       if (!ValidationUtil.validatePhoneNo(spousePhone)) {
         return returnErrorValue("手机号格式错误");
       }
@@ -545,8 +545,8 @@ public class MotanUserServiceImpl implements UserMotanService {
       userSpouse = new UserSpouse(xUserSpouse.getUserId());
       userSpouse.setCreatedAt(timestamp);
     }
-    userSpouse.setSpouseName(status == cn.quantgroup.motan.enums.MaritalStatus.MARRIED ? spouseName : "");
-    userSpouse.setSpousePhone(status == cn.quantgroup.motan.enums.MaritalStatus.MARRIED ? spousePhone : "");
+    userSpouse.setSpouseName(status == cn.quantgroup.user.enums.MaritalStatus.MARRIED ? spouseName : "");
+    userSpouse.setSpousePhone(status == cn.quantgroup.user.enums.MaritalStatus.MARRIED ? spousePhone : "");
     userSpouse.setStatus(MaritalStatus.valueOf(status.name()));
     userSpouse.setUpdateAt(timestamp);
     userSpouse = userSpouseService.save(userSpouse);

src/main/java/cn/quantgroup/xyqb/entity/UserDetail.java

@@ -75,10 +75,10 @@ public class UserDetail implements Serializable {
     xUserDetail.setName(this.getName());
     xUserDetail.setIdNo(this.getIdNo());
     if (this.getIdType() != null) {
-      xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name()));
+      xUserDetail.setIdType(cn.quantgroup.user.enums.IdType.valueOf(this.getIdType().name()));
     }
     if (this.getGender() != null) {
-      xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(this.getGender().name()));
+      xUserDetail.setGender(cn.quantgroup.user.enums.Gender.valueOf(this.getGender().name()));
     }
     xUserDetail.setEmail(this.getEmail());
     xUserDetail.setQq(this.getQq());

src/main/java/cn/quantgroup/xyqb/service/user/vo/UserDetailVO.java

@@ -68,10 +68,10 @@ public class UserDetailVO {
     xUserDetail.setName(this.getName());
     xUserDetail.setIdNo(this.getIdNo());
     if (this.getIdType() != null) {
-      xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name()));
+      xUserDetail.setIdType(cn.quantgroup.user.enums.IdType.valueOf(this.getIdType().name()));
     }
     if (this.getGender() != null) {
-      xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(this.getGender().name()));
+      xUserDetail.setGender(cn.quantgroup.user.enums.Gender.valueOf(this.getGender().name()));
     }
     xUserDetail.setEmail(this.getEmail());
     xUserDetail.setQq(this.getQq());

src/main/resources/config/dev/application.properties

-server.port=8080
+server.port=8082
 security.sessions=if_required
 spring.aop.proxy-target-class=true