Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

昨天 70930071a49190f414c8d8bc9c9e9795a4096739

 zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/ConfigService.java

@@ -7,4 +7,6 @@

    <T> T getVal(String key, Class<T> clazz);

    <T> boolean setVal(String key, T val);

}