From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/domain/EntDemographyParam.java | 60 ++++++++++--------------------------------------------------
1 files changed, 10 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/domain/EntDemographyParam.java b/src/main/java/com/ots/project/exam/domain/EntDemographyParam.java
index cf19042..78d1290 100644
--- a/src/main/java/com/ots/project/exam/domain/EntDemographyParam.java
+++ b/src/main/java/com/ots/project/exam/domain/EntDemographyParam.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.domain;
-
import com.ots.framework.aspectj.lang.annotation.Excel;
import com.ots.framework.web.domain.BaseEntity;
import lombok.Getter;
@@ -7,78 +6,39 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-/**
- * 浜哄彛瀛﹀彉閲忓畾涔夊璞� ent_demography_param
- *
- * @author ots
- * @date 2019-12-11
- */
@Getter
@Setter
public class EntDemographyParam extends BaseEntity {
private static final long serialVersionUID = 1L;
-
- /**
- * 鍙橀噺缂栫爜
- */
+
private Long paramId;
-
- /**
- * 浜哄彛瀛︾紪鐮�
- */
+
@Excel(name = "浜哄彛瀛︾紪鐮�")
private String paramCode;
-
- /**
- * 浜哄彛瀛︾紪鐮佸璇█
- */
+
private String langCodes;
-
- /**
- * 浼佷笟鐢ㄦ埛ID
- */
+
@Excel(name = "浼佷笟鐢ㄦ埛ID")
private Long userId;
-
@Excel(name = "浼佷笟鐢ㄦ埛ID")
private String userName;
-
- /**
- * 鍙橀噺鐘舵�侊紙1姝ｅ父 0鍏抽棴锛�
- */
+
@Excel(name = "鍙橀噺鐘舵��", readConverterExp = "1=姝ｅ父,0=鍏抽棴")
private String paramStatus;
-
- /**
- * 鎺т欢绫诲瀷
- */
+
@Excel(name = "鎺т欢绫诲瀷")
private String types;
-
- /**
- * 鏄惁蹇呭～锛�1鏄級
- */
+
@Excel(name = "蹇呭～")
private String isRequired;
-
- /**
- * 瀛楀吀绫诲瀷
- */
+
@Excel(name = "瀛楀吀绫诲瀷")
private String dicttype;
-
- /**
- * 鎺掑簭
- */
+
@Excel(name = "鎺掑簭")
private Integer sort;
-
- /**
- * 娴嬭瘯鍖呮槸鍚﹂粯璁ら�夋嫨浜�
- */
+
private boolean flag = false;
-
-
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.1