diff --git a/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java
index 93d9887eb..9e59069f1 100644
--- a/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java
+++ b/src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java
@@ -185,4 +185,10 @@ public class SysCustomConfigDetailEntity {
*/
@TableField("isShowXx")
private String isShowXx;
+
+ /**
+ * 是否禁用
+ */
+ @TableField("isImport")
+ private Boolean isImport;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 10d81b490..815fbe996 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,9 +4,9 @@ server:
spring:
datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
- jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+ jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root
- password: 123456
+ password: Glxp@6066
hikari:
connection-timeout: 60000
maximum-pool-size: 20
diff --git a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml
index 9bc006e6f..bde59c29f 100644
--- a/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/SysCustomConfigDetailDao.xml
@@ -17,18 +17,22 @@
AND isShow = #{isShow}
- order by lineNumber asc,number desc
+ order by lineNumber asc, number desc
INSERT INTO sys_custom_config_detail
- (id,configId,type,isShow, columnName,columnDesc,columnType,colorRule,sort,lableRule,width,tooltip,buttonRule,number,
- clickFuc,disabledFuc,expression,size,style,disabled,checkRules,inputType,lineNumber,dataFuc,isShowXx)
- values (#{id},#{configId},#{type},#{isShow}, #{columnName},#{columnDesc},#{columnType},#{colorRule},#{sort},
- #{lableRule},#{width},#{tooltip},#{buttonRule},#{number},#{clickFuc},#{disabledFuc},#{expression},#{size},#{style},
- #{disabled}, #{checkRules}, #{inputType}, #{lineNumber}, #{dataFuc},#{isShowXx})
+ (id, configId, type, isShow, columnName, columnDesc, columnType, colorRule, sort, lableRule, width, tooltip,
+ buttonRule, number,
+ clickFuc, disabledFuc, expression, size, style, disabled, checkRules, inputType, lineNumber, dataFuc, isShowXx,
+ isImport)
+ values (#{id}, #{configId}, #{type}, #{isShow}, #{columnName}, #{columnDesc}, #{columnType}, #{colorRule},
+ #{sort},
+ #{lableRule}, #{width}, #{tooltip}, #{buttonRule}, #{number}, #{clickFuc}, #{disabledFuc},
+ #{expression}, #{size}, #{style},
+ #{disabled}, #{checkRules}, #{inputType}, #{lineNumber}, #{dataFuc}, #{isShowXx}, #{isImport})
@@ -106,6 +110,9 @@
isShowXx=#{isShowXx},
+
+ isImport=#{isImport},
+
WHERE id = #{id}
@@ -127,7 +134,7 @@
SELECT *
FROM sys_custom_config_detail
WHERE (
- id = #{id})
+ id = #{id})
limit 1