合并代码解决冲突

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -67,6 +67,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/dataimport/import").permitAll()
                 .antMatchers("/qc/dataimport/dataimportPrepare").permitAll()
                 .antMatchers("/qc/dataimport/test").permitAll()
+                .antMatchers("/sys/user/pageset/getPageSet").permitAll()
+                .antMatchers("/sys/user/pageset/savePageSet").permitAll()
                 .antMatchers("/consoleByDept/getDept").permitAll()
                 .antMatchers("/console/entryRejectPercent").permitAll()
                 .antMatchers("/console/qcResultLevelPercent").permitAll()
@@ -108,8 +110,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDept/mrCountByDept").permitAll()
                 .antMatchers("/consoleByDept/qcResultShortByDeptPage").permitAll()
                 .antMatchers("/consoleByDept/resultStatisticsByDeptAndDoctorPage").permitAll()
-                .antMatchers("/sys/user/pageset/getPageSet").permitAll()
-                .antMatchers("/sys/user/pageset/savePageSet").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }