diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java index 1fc9ebb..7320cd5 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java @@ -46,14 +46,15 @@ public class CanAddElderTag implements Serializable { private java.lang.String sysOrgCode; /**标签类型 tx体型标签 qx情绪标签*/ @Excel(name = "标签类型", width = 20,dicCode = "elder_tag_type") - @ApiModelProperty(value = "标签类型 tx体型标签 qx情绪标签") + @ApiModelProperty(value = "标签类型") + @Dict(dicCode = "elder_tag_type") private java.lang.String type; /**标签名称*/ @Excel(name = "标签名称", width = 30) @ApiModelProperty(value = "标签名称") private java.lang.String tagName; /**说明*/ - @Excel(name = "说明", width = 40) + @Excel(name = "说明", width = 50) @ApiModelProperty(value = "说明") private java.lang.String describ; /**价格*/ diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java index 44e2ce7..f2ca3c6 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java @@ -39,7 +39,7 @@ public class ElderTag implements Serializable { /**标签类型*/ @Excel(name = "标签类型", width = 15) @ApiModelProperty(value = "标签类型") - @Dict(dictTable = "nu_elder_tag_type",dicText = "type_name",dicCode = "id") + @Dict(dicCode = "elder_tag_type") private java.lang.String type; /**标签名称*/ @Excel(name = "标签名称", width = 15) diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/entity/ElderTagMain.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/entity/ElderTagMain.java index 7c0c402..2e058f7 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/entity/ElderTagMain.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertagmain/entity/ElderTagMain.java @@ -35,7 +35,7 @@ public class ElderTagMain implements Serializable { private String id; /**标签类型*/ @ApiModelProperty(value = "标签类型") - @Dict(dictTable = "nu_elder_tag_type",dicText = "type_name",dicCode = "id") + @Dict(dicCode = "elder_tag_type") private String typeId; /**标签名称*/ @Excel(name = "标签名称", width = 15)