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

src/main/resources/sql/20181204/update_function_service_dict.sql

@@ -1,6 +0,0 @@
--- ftp
-UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 42 AND function_id = 51;
--- mail地址
-UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 149 AND function_id = 37;
--- mail高级
-UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 37 AND function_id = 35;