实体调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/managew/ActiveRecord.java

@@ -26,10 +26,10 @@ public class ActiveRecord extends StringPropertyUUIDEntity {
 	@Column(name = "OPEN_ID")
 	private String openId;//openId
 	@NotNull
-	@Column(name = "OPEN_ID")
+	@Column(name = "TYPE")
 	private Integer type;// 类型1-本人激活 2-他人激活
 	@NotNull
-	@Column(name = "ORDER_SOURCE")
+	@Column(name = "SOURCE_TYPE")
 	@Enumerated(EnumType.STRING)
 	private SourceType sourceType;//来源
 	@NotBlank
@@ -49,13 +49,13 @@ public class ActiveRecord extends StringPropertyUUIDEntity {
 	@Column(name = "CARD_TYPE")
 	private CardType cardType;//卡类型
 	@NotBlank
-	@Column(name = "CARD_ID")
+	@Column(name = "OBU_ID")
 	private String obuId;// OBU号
 	@NotNull
 	@Column(name = "ACTIVE_TIME")
 	private LocalDateTime activeTime;//激活时间
 	@NotNull
-	@Column(name = "STATUS")
+	@Column(name = "RESET_STATUS")
 	private Integer resetStatus;//状态 0-未重置 1-已重置
 	@Column(name = "RESET_TIME")
 	private LocalDateTime resetTime;//更新时间

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/protalConfig/PortalConfigChangeRequest.java

@@ -12,6 +12,7 @@ import com.google.common.collect.Lists;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.hutool.core.collection.CollectionUtil;
 import lombok.Getter;
+import lombok.Setter;
 
 /**
  * @Author weicailin
@@ -19,6 +20,7 @@ import lombok.Getter;
  * @Email 13079168756@163.com
  **/
 @Getter
+@Setter
 public class PortalConfigChangeRequest extends AbstractBizRequestDTO {
 
     /**
@@ -76,11 +78,6 @@ public class PortalConfigChangeRequest extends AbstractBizRequestDTO {
      */
     private EnableStatus applyChangeOCROtherInfo;
 
-    /**
-     * 登录来源方
-     */
-    private String loginSource;
-
     /**
      * 一路开关
      */
@@ -133,10 +130,6 @@ public class PortalConfigChangeRequest extends AbstractBizRequestDTO {
             applyChangeOCROtherInfo = EnableStatus.DISABLE; //默认不启用
         }
 
-        if (loginSource == null || SourceType.findByCode(loginSource) == null) {
-            failParamInfo.add("登录来源方");
-        }
-
 
         //检验输错的数据参数
         if (!CollectionUtil.isEmpty(failParamInfo)) {