Merge branch 'dev' of http://192.168.1.220:10080/chenweida/jw2.0 into dev

svr/svr-base/src/main/java/com/yihu/jw/version/dao/ServerVersionLogDao.java

@@ -13,6 +13,6 @@ public interface ServerVersionLogDao extends PagingAndSortingRepository<BaseServ
    @Query("from BaseServerVersionLog f where f.name=?1 and f.status=1")
    BaseServerVersionLog findByName(String name);
    @Query("from BaseServerVersionLog f where f.code=?1 and f.status=1")
    @Query("from BaseServerVersionLog f where f.id=?1 and f.status=1")
    BaseServerVersionLog findByCode(String code);
}

svr/svr-manage/src/main/java/com/yihu/jw/manage/config/MvcConfig.java

@@ -46,6 +46,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
    @Bean
    public HiddenHttpMethodFilter hiddenHttpMethodFilter() {
        return new HiddenHttpMethodFilter();
        HiddenHttpMethodFilter hiddenHttpMethodFilter= new HiddenHttpMethodFilter();
        return hiddenHttpMethodFilter;
    }
}