From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 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 39e9ba8..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;
@@ -63,6 +60,7 @@
*/
@Excel(name = "澶囨敞璇︽儏")
@ApiModelProperty("澶囨敞璇︽儏")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String remark;
/**
@@ -81,6 +79,7 @@
@ApiModelProperty("灏忕粨")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String summary;
@@ -122,11 +121,34 @@
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