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/TjPackage.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPackage.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPackage.java
index 296b472..fb532f5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPackage.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPackage.java
@@ -35,15 +35,28 @@
*/
@ApiModelProperty(value = "濂楅id")
@TableId
- @JsonSerialize(using = ToStringSerializer.class)
- private Long pacId;
+// @JsonSerialize(using = ToStringSerializer.class)
+ private String pacId;
+
+ /**
+ * 濂楅his缂栫爜
+ */
+ @Excel(name = "濂楅his缂栫爜")
+ @ApiModelProperty(value = "濂楅his缂栫爜")
+ private String hisPacBm;
/**
* 濂楅鍚嶇О
*/
@Excel(name = "濂楅鍚嶇О")
@ApiModelProperty(value = "濂楅鍚嶇О")
private String pacName;
+
+
+
+ @ApiModelProperty(value = "鎷奸煶鐮�")
+ private String pym;
+
/**
* 鍥剧墖锛圔ase64缂栫爜锛�
@@ -57,6 +70,12 @@
@Excel(name = "浠锋牸")
@ApiModelProperty(value = "浠锋牸")
private BigDecimal price;
+
+ @ApiModelProperty(value = "鎶樻墸")
+ private String limits;
+
+ @ApiModelProperty(value = "浼樻儬浠锋牸")
+ private BigDecimal newPrice;
/**
* 濂楅鎻忚堪
@@ -179,18 +198,16 @@
@TableField(exist = false)
private List<String> keyIds;
+ /** his濂楅 */
+ private String hisPacId;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("pacId", getPacId())
- .append("pacName", getPacName())
- .append("pacRemark", getPacRemark())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("deleted", getDeleted())
- .toString();
- }
+ /**
+ * 浣撴绫诲埆
+ */
+ @ApiModelProperty("浣撴绫诲埆")
+ private String tjCategory;
+
+ @TableField(exist = false)
+ private List<TjPackageProject> packageProjects;
+
}
--
Gitblit v1.8.0