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; /** * 提成价格