From e9da735940e6dcb52bab52099efc3591eed97e36 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 16 Mar 2026 10:44:02 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF-=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=EF=BC=9A=E5=AE=9E=E7=8E=B0=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=87=B3=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E9=80=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=E7=9A=84=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=88=E5=8F=AF=E6=A0=B9=E6=8D=AE=E5=88=86=E7=B1=BB=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=88=AB=E3=80=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B=E3=80=81=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=89=8D=E4=B8=89=E7=BA=A7=E7=9A=84=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86=EF=BC=89=202=E3=80=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E4=BF=A1=E6=81=AF-=E9=87=8D=E7=BD=AE=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=203=E3=80=81?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=9C=BA=E6=9E=84=E8=B4=9F=E8=B4=A3=E4=BA=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=90=8E=E7=9A=84=E2=80=9C=E5=B0=9A=E6=9C=AA=E5=BD=92?= =?UTF-8?q?=E5=B1=9E=E9=83=A8=E9=97=A8=E2=80=9D=E6=8F=90=E7=A4=BA=204?= =?UTF-8?q?=E3=80=81=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E6=A0=87=E7=AD=BE=E5=8E=BB=E6=8E=89=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=90=AF=E7=94=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E5=BA=9F=E5=90=8E=E7=A7=BB=E9=99=A4=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=B7=B2=E5=88=86=E9=85=8D=E7=9A=84=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=205=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E5=92=8C=E9=95=BF=E8=80=85=E6=A0=87=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=B4=B9=E4=BB=B7=E6=A0=BC=E6=94=B9=E4=B8=BA=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nu/dto/DirectiveAsyncMQDto.java | 2 +- .../src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java | 2 +- .../src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java | 2 +- .../nu/modules/canadddirective/entity/CanAddDirective.java | 6 +++--- .../com/nu/modules/directivebk/entity/DirectiveBkItem.java | 6 +++--- .../modules/directiveopelog/entity/DirectiveOpeLogInfo.java | 6 +++--- .../directivesynclog/entity/DirectiveSyncLogInfo.java | 6 +++--- .../servicedirective/entity/ConfigServiceDirective.java | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java index 27a0afe..0c3e328 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveAsyncMQDto.java @@ -36,7 +36,7 @@ public class DirectiveAsyncMQDto implements Serializable { */ private String directiveName; /** - * 收费价格 + * 基础价格 */ private java.math.BigDecimal tollPrice; /** diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java index 7b0e70c..e5ecf81 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveOpeLogInfoMQDto.java @@ -68,7 +68,7 @@ public class DirectiveOpeLogInfoMQDto implements Serializable { */ private String directiveName; /** - * 收费价格 + * 基础价格 */ private BigDecimal tollPrice; /** diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java index 6c4a7f8..93550cb 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveSyncLogInfoMQDto.java @@ -62,7 +62,7 @@ public class DirectiveSyncLogInfoMQDto implements Serializable { */ private String directiveName; /** - * 收费价格 + * 基础价格 */ private BigDecimal tollPrice; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/entity/CanAddDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/entity/CanAddDirective.java index 7d8fc19..9a1181c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/entity/CanAddDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/entity/CanAddDirective.java @@ -87,10 +87,10 @@ public class CanAddDirective implements Serializable { @ApiModelProperty(value = "情绪标签") private java.lang.String emotionTags; /** - * 收费价格 + * 基础价格 */ - @Excel(name = "收费价格", width = 15) - @ApiModelProperty(value = "收费价格") + @Excel(name = "基础价格", width = 15) + @ApiModelProperty(value = "基础价格") private java.math.BigDecimal tollPrice; /** * 提成价格 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 caa6a8d..c59492c 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 @@ -83,10 +83,10 @@ public class DirectiveBkItem implements Serializable { @Dict(dicCode = "service_attribute") private java.lang.String serviceAttribute; /** - * 收费价格 + * 基础价格 */ - @Excel(name = "收费价格(元)", width = 20) - @ApiModelProperty(value = "收费价格") + @Excel(name = "基础价格(元)", width = 20) + @ApiModelProperty(value = "基础价格") private java.math.BigDecimal tollPrice; /** * 提成价格 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java index 7252fcf..47f6502 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directiveopelog/entity/DirectiveOpeLogInfo.java @@ -74,9 +74,9 @@ public class DirectiveOpeLogInfo implements Serializable { @Excel(name = "服务指令名称", width = 15) @ApiModelProperty(value = "服务指令名称") private String directiveName; - /**收费价格*/ - @Excel(name = "收费价格", width = 15) - @ApiModelProperty(value = "收费价格") + /**基础价格*/ + @Excel(name = "基础价格", width = 15) + @ApiModelProperty(value = "基础价格") private BigDecimal tollPrice; /**提成价格*/ @Excel(name = "提成价格", width = 15) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivesynclog/entity/DirectiveSyncLogInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivesynclog/entity/DirectiveSyncLogInfo.java index dd68003..81d32ab 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivesynclog/entity/DirectiveSyncLogInfo.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivesynclog/entity/DirectiveSyncLogInfo.java @@ -89,10 +89,10 @@ public class DirectiveSyncLogInfo implements Serializable { @ApiModelProperty(value = "服务指令名称") private java.lang.String directiveName; /** - * 收费价格 + * 基础价格 */ - @Excel(name = "收费价格", width = 15) - @ApiModelProperty(value = "收费价格") + @Excel(name = "基础价格", width = 15) + @ApiModelProperty(value = "基础价格") private java.math.BigDecimal tollPrice; /** * 提成价格 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java index 535dbb8..768695e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java @@ -64,10 +64,10 @@ public class ConfigServiceDirective implements Serializable { @ApiModelProperty(value = "服务指令名称") private java.lang.String directiveName; /** - * 收费价格 + * 基础价格 */ - @Excel(name = "收费价格", width = 15) - @ApiModelProperty(value = "收费价格") + @Excel(name = "基础价格", width = 15) + @ApiModelProperty(value = "基础价格") private java.math.BigDecimal tollPrice; /** * 提成价格