Merge branch 'rcs_master' into jdxaj

zhang

4 小时以前 82416a8117dd69be757380e8a42ecbac6e861e11

 zy-acs-framework/src/main/java/com/zy/acs/framework/common/Cools.java

@@ -108,7 +108,7 @@
    /**
     * map 转 对象
     */
    public static <T> T conver(Map<? extends String, ?> map, Class<T> cls){
    public static <T> T convert(Map<? extends String, ?> map, Class<T> cls){
        T instance = null;
        try {
            Constructor<T> constructor = cls.getDeclaredConstructor();