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/EntDemographyInfo.java | 44 +++++++-------------------------------------
1 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/domain/EntDemographyInfo.java b/src/main/java/com/ots/project/exam/domain/EntDemographyInfo.java
index aa8e3ff..f99dd21 100644
--- a/src/main/java/com/ots/project/exam/domain/EntDemographyInfo.java
+++ b/src/main/java/com/ots/project/exam/domain/EntDemographyInfo.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,59 +6,30 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-/**
- * 浜哄彛瀛︿俊鎭璞� ent_demography_info
- *
- * @author ots
- * @date 2019-12-15
- */
@Getter
@Setter
public class EntDemographyInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
-
- /**
- * 淇℃伅缂栫爜
- */
+
private Long infoId;
-
- /**
- * 鎵�灞炰紒涓�
- */
+
@Excel(name = "鎵�灞炰紒涓�")
private Long userId;
-
- /**
- * 鐢ㄦ埛缂栫爜
- */
+
@Excel(name = "鐢ㄦ埛缂栫爜")
private Long memberId;
-
- /**
- * 鍙傛暟缂栫爜
- */
+
@Excel(name = "鍙傛暟缂栫爜")
private String paramId;
-
- /**
- * 鍙傛暟鍚嶇О
- */
+
@Excel(name = "鍙傛暟鍚嶇О")
private String paramName;
-
- /**
- * 绛旈鐨勮瑷�
- */
+
private String langType;
-
- /**
- * 鍙傛暟鍊�
- */
+
@Excel(name = "鍙傛暟鍊�")
private String paramValue;
-
private String langCodes;
-
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.9.1