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/demo/domain/UserOperateModel.java |   35 +----------------------------------
 1 files changed, 1 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/ots/project/demo/domain/UserOperateModel.java b/src/main/java/com/ots/project/demo/domain/UserOperateModel.java
index 7e86f3c..f84fa7e 100644
--- a/src/main/java/com/ots/project/demo/domain/UserOperateModel.java
+++ b/src/main/java/com/ots/project/demo/domain/UserOperateModel.java
@@ -1,45 +1,30 @@
 package com.ots.project.demo.domain;
-
 import com.ots.common.utils.DateUtils;
 import com.ots.framework.aspectj.lang.annotation.Excel;
 import com.ots.framework.aspectj.lang.annotation.Excel.Type;
 import com.ots.framework.web.domain.BaseEntity;
-
 import java.util.Date;
-
 public class UserOperateModel extends BaseEntity {
     private static final long serialVersionUID = 1L;
-
     private int userId;
-
     @Excel(name = "鐢ㄦ埛缂栧彿")
     private String userCode;
-
     @Excel(name = "鐢ㄦ埛濮撳悕")
     private String userName;
-
     @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
     private String userSex;
-
     @Excel(name = "鐢ㄦ埛鎵嬫満")
     private String userPhone;
-
     @Excel(name = "鐢ㄦ埛閭")
     private String userEmail;
-
     @Excel(name = "鐢ㄦ埛浣欓")
     private double userBalance;
-
     @Excel(name = "鐢ㄦ埛鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
     private String status;
-
     @Excel(name = "鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date createTime;
-
     public UserOperateModel() {
-
     }
-
     public UserOperateModel(int userId, String userCode, String userName, String userSex, String userPhone,
                             String userEmail, double userBalance, String status) {
         this.userId = userId;
@@ -52,76 +37,58 @@
         this.status = status;
         this.createTime = DateUtils.getNowDate();
     }
-
     public int getUserId() {
         return userId;
     }
-
     public void setUserId(int userId) {
         this.userId = userId;
     }
-
     public String getUserCode() {
         return userCode;
     }
-
     public void setUserCode(String userCode) {
         this.userCode = userCode;
     }
-
     public String getUserName() {
         return userName;
     }
-
     public void setUserName(String userName) {
         this.userName = userName;
     }
-
     public String getUserSex() {
         return userSex;
     }
-
     public void setUserSex(String userSex) {
         this.userSex = userSex;
     }
-
     public String getUserPhone() {
         return userPhone;
     }
-
     public void setUserPhone(String userPhone) {
         this.userPhone = userPhone;
     }
-
     public String getUserEmail() {
         return userEmail;
     }
-
     public void setUserEmail(String userEmail) {
         this.userEmail = userEmail;
     }
-
     public double getUserBalance() {
         return userBalance;
     }
-
     public void setUserBalance(double userBalance) {
         this.userBalance = userBalance;
     }
-
     public String getStatus() {
         return status;
     }
-
     public void setStatus(String status) {
         this.status = status;
     }
-
     public Date getCreateTime() {
         return createTime;
     }
-
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1