From 91fa6ce4a7a8d75bad9a41a5c282b97b4891ef7e Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 3 Mar 2026 13:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=A4=87=E4=BB=BD=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../directivebk/entity/DirectiveBkItem.java | 14 ++++++++++---- .../mapper/xml/ConfigServiceDirectiveMapper.xml | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java index 0f1f5a0..caa6a8d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivebk/entity/DirectiveBkItem.java @@ -66,15 +66,22 @@ public class DirectiveBkItem implements Serializable { /** * 服务指令名称 */ - @Excel(name = "服务指令名称", width = 40) + @Excel(name = "服务指令", width = 40) @ApiModelProperty(value = "服务指令名称") private java.lang.String directiveName; /** * 周期类型中文名称 */ - @Excel(name = "周期类型", width = 20) +// @Excel(name = "周期类型", width = 20) @ApiModelProperty(value = "周期类型中文名称") private java.lang.String cycleTypeName; + /** + * 服务属性 ds定时 js计时 + */ + @Excel(name = "服务属性", width = 15, dicCode = "service_attribute") + @ApiModelProperty(value = "服务属性") + @Dict(dicCode = "service_attribute") + private java.lang.String serviceAttribute; /** * 收费价格 */ @@ -140,7 +147,7 @@ public class DirectiveBkItem implements Serializable { /** * 服务说明 */ - @Excel(name = "服务描述", width = 50) + @Excel(name = "服务指令描述", width = 50) @ApiModelProperty(value = "服务描述") private java.lang.String serviceContent; /** @@ -152,7 +159,6 @@ public class DirectiveBkItem implements Serializable { /** * 超时时长（分钟） */ - @Excel(name = "超时时长（分钟）", width = 18) @ApiModelProperty(value = "超时时长（分钟）") private java.lang.String timeoutDuration; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 7ee7aba..6e315d3 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -173,6 +173,7 @@ m.instruction_tag_id, m.category_id, m.type_id, + m.service_attribute, m.toll_price, m.com_price, m.service_duration,