Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

2018-11-26 17:13:05 +08:00
parent 67d8b893e3 6d980848c9
commit d75ef7f4b0
28 changed files with 2794 additions and 67 deletions
--- a/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml
@@ -225,8 +225,8 @@
    )values (
   		#{cfgDesc,jdbcType=VARCHAR},
   		#{action,jdbcType=INTEGER}, 
-    	0,
-    	0,
+    	#{isValid,jdbcType=INTEGER},
+    	#{isAudit,jdbcType=INTEGER},
    	#{creatorId,jdbcType=INTEGER}, 
   		#{createTime,jdbcType=TIMESTAMP},
   		#{editorId,jdbcType=INTEGER},