From 0293e06edd011d6921ec2cc08392042f5765dfb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 九月 2025 13:35:54 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java | 175 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 119 insertions(+), 56 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java
index 2dbc47e..f489ea9 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceOrganallocation.java
@@ -1,11 +1,9 @@
package com.ruoyi.project.domain;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
@@ -13,168 +11,230 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
/**
* 鍣ㄥ畼鍒嗛厤瀵硅薄 service_organallocation
- *
+ *
* @author ruoyi
* @date 2021-11-10
*/
@Data
@ApiModel("鍣ㄥ畼鍒嗛厤")
-public class ServiceOrganallocation extends BaseEntity
-{
+public class ServiceOrganallocation extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 瀵瑰簲鍣ㄥ畼琛╯ervice_donateorgan鐨処D */
+ /**
+ * 瀵瑰簲鍣ㄥ畼琛╯ervice_donateorgan鐨処D
+ */
@Excel(name = "瀵瑰簲鍣ㄥ畼琛╯ervice_donateorgan鐨処D")
private Long organid;
- /** 鍣ㄥ畼缂栧彿 */
+ /**
+ * 鍣ㄥ畼缂栧彿
+ */
@ApiModelProperty("鍣ㄥ畼缂栧彿")
@Excel(name = "鍣ㄥ畼缂栧彿")
private String organnumber;
- /** 鐢宠浜虹紪鍙� */
+ /**
+ * 鐢宠浜虹紪鍙�
+ */
@Excel(name = "鐢宠浜虹紪鍙�")
- @ApiModelProperty("鐢宠浜虹紪鍙�")
+ @ApiModelProperty("鐢宠浜虹紪鍙�")
private String applicantuserid;
- /** 鐢宠浜哄鍚� */
+ /**
+ * 鐢宠浜哄鍚�
+ */
@ApiModelProperty("鐢宠浜哄鍚�")
@Excel(name = "鐢宠浜哄鍚�")
private String applicantusername;
- /** 鐢宠鏃堕棿 */
+ /**
+ * 鐢宠鏃堕棿
+ */
@ApiModelProperty("鐢宠鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMH+08:00")
@Excel(name = "鐢宠鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date applicanttime;
- /** 瀹℃牳浜虹紪鍙� */
+ /**
+ * 瀹℃牳浜虹紪鍙�
+ */
@ApiModelProperty("瀹℃牳浜虹紪鍙�")
@Excel(name = "瀹℃牳浜虹紪鍙�")
private String checkuserid;
- /** 瀹℃牳浜哄鍚� */
+ /**
+ * 瀹℃牳浜哄鍚�
+ */
@ApiModelProperty("瀹℃牳浜哄鍚�")
@Excel(name = "瀹℃牳浜哄鍚�")
private String checkusername;
- /** 瀹℃牳鏃堕棿 */
+ /**
+ * 瀹℃牳鏃堕棿
+ */
@ApiModelProperty("瀹℃牳鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date checktime;
- /** 瀹℃牳鎰忚 */
+ /**
+ * 瀹℃牳鎰忚
+ */
@ApiModelProperty("瀹℃牳鎰忚")
@Excel(name = "瀹℃牳鎰忚")
private String checksuggestion;
- /** 0:鎻愪氦鍒嗛厤锛�1锛氬鏍搁�氳繃锛�2锛氬鏍告嫆缁� */
+ /**
+ * 0:鎻愪氦鍒嗛厤锛�1锛氬鏍搁�氳繃锛�2锛氬鏍告嫆缁�
+ */
@Excel(name = "0:鎻愪氦鍒嗛厤锛�1锛氬鏍搁�氳繃锛�2锛氬鏍告嫆缁�")
@ApiModelProperty("鍒嗛厤鐘舵��")
private Long allocationstatus;
- /** 绉绘浜哄鍚� */
+ /**
+ * 绉绘浜哄鍚�
+ */
@ApiModelProperty("绉绘浜哄鍚�")
@Excel(name = "绉绘浜哄鍚�")
private String name;
- /** 绉绘浜烘�у埆 鏍规嵁瀛楀吀sys_user_sex */
+ /**
+ * 绉绘浜烘�у埆 鏍规嵁瀛楀吀sys_user_sex
+ */
@Excel(name = "绉绘浜烘�у埆 鏍规嵁瀛楀吀sys_user_sex")
- @ApiModelProperty("绉绘浜烘�у埆")
+ @ApiModelProperty("绉绘浜烘�у埆")
private Long sex;
- /** 绉绘浜鸿瘉浠剁被鍨� 鏍规嵁瀛楀吀sys_IDType */
- @ApiModelProperty("绉绘浜鸿瘉浠剁被鍨�")
+ /**
+ * 绉绘浜鸿瘉浠剁被鍨� 鏍规嵁瀛楀吀sys_IDType
+ */
+ @ApiModelProperty("绉绘浜鸿瘉浠剁被鍨�")
@Excel(name = "绉绘浜鸿瘉浠剁被鍨� 鏍规嵁瀛楀吀sys_IDType")
private Long idcardtype;
- /** 绉绘浜鸿瘉浠跺彿鐮� */
+ /**
+ * 绉绘浜鸿瘉浠跺彿鐮�
+ */
@ApiModelProperty("绉绘浜鸿瘉浠跺彿鐮�")
@Excel(name = "绉绘浜鸿瘉浠跺彿鐮�")
private String idcardno;
- /** 绉绘浜哄勾榫� */
- @ApiModelProperty("绉绘浜哄勾榫�")
+ /**
+ * 绉绘浜哄勾榫�
+ */
+ @ApiModelProperty("绉绘浜哄勾榫�")
@Excel(name = "绉绘浜哄勾榫�")
private Long age;
- /** 绉绘浜哄勾榫勫崟浣� 鏍规嵁瀛楀吀sys_AgeUnit */
+ /**
+ * 绉绘浜哄勾榫勫崟浣� 鏍规嵁瀛楀吀sys_AgeUnit
+ */
@Excel(name = "绉绘浜哄勾榫勫崟浣� 鏍规嵁瀛楀吀sys_AgeUnit")
- @ApiModelProperty("绉绘浜哄勾榫勫崟浣�")
+ @ApiModelProperty("绉绘浜哄勾榫勫崟浣�")
private String ageunit;
- /** 绉绘浜哄嚭鐢熸棩鏈� */
+ /**
+ * 绉绘浜哄嚭鐢熸棩鏈�
+ */
@Excel(name = "绉绘浜哄嚭鐢熸棩鏈�")
@ApiModelProperty("绉绘浜哄嚭鐢熸棩鏈�")
private String birthday;
- /** 绉绘浜鸿仈绯荤數璇� */
+ /**
+ * 绉绘浜鸿仈绯荤數璇�
+ */
@Excel(name = "绉绘浜鸿仈绯荤數璇�")
- @ApiModelProperty("绉绘浜鸿仈绯荤數璇�")
+ @ApiModelProperty("绉绘浜鸿仈绯荤數璇�")
private String phone;
- /** 绉绘浜虹幇浣忓湴鍧� */
+ /**
+ * 绉绘浜虹幇浣忓湴鍧�
+ */
@Excel(name = "绉绘浜虹幇浣忓湴鍧�")
- @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�")
+ @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�")
private String residenceaddress;
- /** 绉绘浜虹幇浣忓湴鍧�鐪佷唬鐮� */
+ /**
+ * 绉绘浜虹幇浣忓湴鍧�鐪佷唬鐮�
+ */
@Excel(name = "绉绘浜虹幇浣忓湴鍧�鐪佷唬鐮�")
- @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佷唬鐮�")
+ @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佷唬鐮�")
private String residenceprovince;
- /** 绉绘浜虹幇浣忓湴鍧�鐪佸悕绉� */
+ /**
+ * 绉绘浜虹幇浣忓湴鍧�鐪佸悕绉�
+ */
@Excel(name = "绉绘浜虹幇浣忓湴鍧�鐪佸悕绉�")
- @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佸悕绉�")
+ @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佸悕绉�")
private String residenceprovincename;
- /** 绉绘浜哄競缂栧彿 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 绉绘浜哄競缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@Excel(name = "绉绘浜哄競缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
- @ApiModelProperty("绉绘浜哄競缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
+ @ApiModelProperty("绉绘浜哄競缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
private String residencecity;
- /** 绉绘浜哄競鍚嶇О */
+ /**
+ * 绉绘浜哄競鍚嶇О
+ */
@Excel(name = "绉绘浜哄競鍚嶇О")
- @ApiModelProperty("绉绘浜哄競鍚嶇О")
+ @ApiModelProperty("绉绘浜哄競鍚嶇О")
private String residencecityname;
- /** 绉绘浜烘墍灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 绉绘浜烘墍灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�
+ */
@Excel(name = "绉绘浜烘墍灞炶閬�", readConverterExp = "闀�=")
- @ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�")
+ @ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�")
private String residencetown;
- /** 绉绘浜烘墍灞炶閬擄紙闀囷級鍚嶇О */
+ /**
+ * 绉绘浜烘墍灞炶閬擄紙闀囷級鍚嶇О
+ */
@Excel(name = "绉绘浜烘墍灞炶閬�", readConverterExp = "闀�=")
- @ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鍚嶇О")
+ @ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鍚嶇О")
private String residencetownname;
- /** 绉绘浜虹ぞ鍖猴紙鏉戯級缂栧彿 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 绉绘浜虹ぞ鍖猴紙鏉戯級缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@Excel(name = "绉绘浜虹ぞ鍖�", readConverterExp = "鏉�=")
- @ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
+ @ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
private String residencecommunity;
- /** 绉绘浜虹ぞ鍖猴紙鏉戯級鍚嶇О */
+ /**
+ * 绉绘浜虹ぞ鍖猴紙鏉戯級鍚嶇О
+ */
@Excel(name = "绉绘浜虹ぞ鍖�", readConverterExp = "鏉�=")
- @ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級鍚嶇О")
+ @ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級鍚嶇О")
private String residencecommunityname;
- /** 绉绘浜烘墍灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛� */
+ /**
+ * 绉绘浜烘墍灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�
+ */
@Excel(name = "绉绘浜烘墍灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
- @ApiModelProperty("绉绘浜烘墍灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+ @ApiModelProperty("绉绘浜烘墍灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
private String residencecountycode;
- /** 绉绘浜烘墍灞炲尯鍩熷悕绉� */
+ /**
+ * 绉绘浜烘墍灞炲尯鍩熷悕绉�
+ */
@Excel(name = "绉绘浜烘墍灞炲尯鍩熷悕绉�")
- @ApiModelProperty("绉绘浜烘墍灞炲尯鍩熷悕绉�")
+ @ApiModelProperty("绉绘浜烘墍灞炲尯鍩熷悕绉�")
private String residencecountyname;
@@ -192,8 +252,11 @@
@TableField(exist = false)
private String city;
- /** 鎶ュ憡鑰呯紪鍙� */
+ /**
+ * 鎶ュ憡鑰呯紪鍙�
+ */
@TableField(exist = false)
private String reporterno;
+
}
--
Gitblit v1.9.3