From 5f746792c5d5e126bafea02ce411d946de0427ea Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 21 Mar 2019 14:11:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=BE=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index e7222a2..75819f7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -40,9 +40,9 @@ public class SysDictionary extends BaseBean { private String dictionaryCode; //枚举 CommonEnumUtil.SOFT_TYPE - @Column(name="SOFT_TYPE") - @ApiParam(value ="微服务软件类型") - private Integer softType; + @Column(name="DICTIONARY_SOFT_TYPE") + @ApiParam(value ="字典所属模块") + private Integer dictionarySoftType; // 根节点-1 @Column(name="PARENT_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index c7f9c85..4087ce4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -407,7 +407,7 @@ public class CoreHqlPack { // and HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result); + HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); @@ -428,7 +428,7 @@ public class CoreHqlPack { // and HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result); + HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);