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/TjOrderDetail.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
index 929ba6d..aa08c6e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
@@ -19,6 +19,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* 浣撴椤圭洰鏄庣粏瀵硅薄 tj_order_detail
@@ -63,6 +64,9 @@
@Excel(name = "椤圭洰")
@JsonSerialize(using = ToStringSerializer.class)
private Long proId;
+
+ @TableField(exist = false)
+ private String prosId;
/**
* 鏍囧噯缁撴灉(鍏宠仈鏍囧噯琛�)
@@ -109,6 +113,9 @@
@Excel(name = "鏄惁涓哄姞椤�",dictType="sys_yes_no")
@ApiModelProperty(value = "鏄惁涓哄姞椤�")
private String isAddition;
+
+ @ApiModelProperty(value = "鍔犻」鏍囧織")
+ private String jxbz;
@ApiModelProperty(value = "娴佹按id")
@TableField(updateStrategy = FieldStrategy.IGNORED)
@@ -212,13 +219,29 @@
@TableField(exist = false)
private String ycbz;
-
/**
* 鍗曚綅
*/
@TableField(exist = false)
private String unit;
+ @TableField(exist = false)
+ private String bt;
+
+ @TableField(exist = false)
+ private String nr;
+ @TableField(exist = false)
+ private List<Map<String,Object>> advices;
+
+ @TableField(exist = false)
+ private String deptId;
+
+ @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