Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/build.war/src/main/java/com/beecode/inz/war/SecurityConfig.java

@@ -253,7 +253,7 @@ public class SecurityConfig  {
 			http.sessionManagement().maximumSessions(1);
 			http.csrf().disable();
 			http.cors().disable();
-			http.antMatcher("/warehouse/**").authorizeRequests()
+			http.antMatcher("/warehouse/api/**").authorizeRequests()
 //			.antMatchers("/warehouse/user").permitAll()
 			.anyRequest().authenticated();
 			

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java

@@ -94,7 +94,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
         KObject staff = AminoContextHolder.getContext().getStaff();
         kobject.set("modifyTime", new Date());
         kobject.set("modifier", staff.getUuid("id"));
-        kobject.set("del", true);
+        kobject.set("del", false);
         template.merge(kobject);
     }