From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
index 7bda129..ef71ad5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
@@ -1,9 +1,6 @@
package com.ltkj.hosp.domain;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -43,6 +40,8 @@
@ApiModelProperty(value = "鐖堕」鐩甶d")
@JsonSerialize(using = ToStringSerializer.class)
private Long proId;
+ @TableField(exist = false)
+ private String prosId;
@ApiModelProperty(value = "鐖堕」鐩悕绉�")
@TableField(exist = false)
@@ -61,6 +60,7 @@
*/
@Excel(name = "澶囨敞璇︽儏")
@ApiModelProperty("澶囨敞璇︽儏")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String remark;
/**
@@ -79,6 +79,7 @@
@ApiModelProperty("灏忕粨")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String summary;
@@ -116,6 +117,38 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date yqDeadline;
+ @ApiModelProperty(value = "鍔犻」鏍囧織")
+ private String jxbz;
+
+
+ @ApiModelProperty(value = "鏀惰垂鏍囧織")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private String sfbz;
+
+
+ @ApiModelProperty(value = "椤圭洰绫诲埆")
+ @TableField(exist = false)
+ private String xmlb;
+
+
+ @ApiModelProperty(value = "缁撴灉琛ㄧ幇")
+ @TableField(exist = false)
+ private String jgbx;
+
+ @TableField(exist = false)
+// 0妫�楠� 1妫�鏌�
+ private String jyjc;
+
+
+
+ @TableField(exist = false)
+// 绉戝
+ private String ks;
+
+ @TableField(exist = false)
+ private String orgType;
+
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.8.0