commit 5ebf846461c5de9593106b5466dbe9011f456b60
author binquan.qiu <binquan.qiu@supwisdom.com> 周五 8月 23 10:48:00 2019 +0800
committer binquan.qiu <binquan.qiu@supwisdom.com> 周五 8月 23 10:49:44 2019 +0800
tree fba57f9e29ca94702b21ac51a01798b30309d9e1
parent dcc541379785f009862c8e14f77f9a4202c714e9

sql修改，删除全局参数管理

Conflicts:
	src/main/java/com/supwisdom/dlpay/api/service/impl/PayApiServiceImpl.java
	src/main/java/com/supwisdom/dlpay/api/service/impl/PosPayServiceImpl.java

build.gradle

diff --git a/build.gradle b/build.gradle
index 97f290e..cf76fc3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -85,7 +85,7 @@
     implementation group: 'com.sun.jersey', name: 'jersey-client', version: '1.19'
     implementation group: 'javax.servlet', name: 'jstl', version: '1.2'
     implementation group: 'taglibs', name: 'standard', version: '1.1.2'
-    implementation group: 'commons-codec', name: 'commons-codec', version: '1.6'
+    implementation group: 'commons-codec', name: 'commons-codec', version: '1.13'
     implementation 'org.apache.commons:commons-lang3:3.9'
     implementation files('libs/ojdbc6.jar')
 

src/main/resources/data.sql

diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index 9e49b9f..2e222d2 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -105,8 +105,8 @@
 INSERT INTO "tb_function"(id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (1, NULL, 1, NULL, '', '/custtype/index', '客户类型维护', 1, 22);
 INSERT INTO "tb_function"(id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (23, NULL, 1, NULL, 'layui-icon-home', '/customer/index', '就餐对象管理', 3, 22);
 INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (10, NULL, 0, NULL, 'layui-icon-util', '#', '参数管理', 3, -1);
-INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (11, NULL, 1, NULL, 'layui-icon-util', '/param/syspara', '系统参数配置', 1, 10);
-INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (12, NULL, 1, NULL, 'layui-icon-util', '/param/businesspara', '全局参数配置', 2, 10);
+--INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (11, NULL, 1, NULL, 'layui-icon-util', '/param/syspara', '系统参数配置', 1, 10);
+INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (12, NULL, 1, NULL, 'layui-icon-util', '/param/businesspara', '业务参数配置', 2, 10);
 INSERT INTO "tb_function" (id,createtime,isleaf,lastsaved,menuicon,menuurl,name,ordernum,parentid) VALUES (17, NULL, 1, NULL, 'layui-icon-util', '/param/apiclientpara', '应用参数配置', 3, 10);
 
 INSERT INTO "tb_mealtype" (mealtype,endtime,lastsaved,mealname) VALUES ('dinner', '200000', '20190709102922', '晚餐');