解决冲突

6 years ago · 5d730ed5c8
parent 72bdd253fa
commit 5d730ed5c8
2 changed files with 0 additions and 7 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java
@ -63,8 +63,4 @@ public class MesDatasource extends BaseBean {
    @ApiParam("数据库名称")
    private String dsDbName;

-    @Column(name = "DS_DB_NAME")
-    @ApiParam("数据库名称")
-    private String dsDbName;
-
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@ -1297,9 +1297,6 @@ public class MesHqlPack {
        if (!StringUtils.isEmpty(mesDatasource.getDsCode())) {
            DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean);
        }
-        if (!StringUtils.isEmpty(mesDatasource.getDsName())) {
-            DdlPreparedPack.getStringEqualPack(mesDatasource.getDsName(), "dsName", packBean);
-        }
        if (!StringUtils.isEmpty(mesDatasource.getDsType())) {
            DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean);
        }