测试git提交冲突问题

刘小明

2024-08-15 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58

 pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/config/WebFilterConfiguration.java

@@ -29,7 +29,6 @@
            filterRegistrationBean.addUrlPatterns("/*");//配置过滤规则
            filterRegistrationBean.setName("devStageFilter");//设置过滤器名称
            filterRegistrationBean.setOrder(order_DevStageFilter);//执行次序
            //
        }else{
            filterRegistrationBean.setFilter(new UserTokenFilter());
            filterRegistrationBean.addUrlPatterns("/*");//配置过滤规则