Merge remote-tracking branch 'origin/master'

xuhy

2023-04-07 7454b6532cd2a5c68235a45f1cc540e25f1ffaf4

 driver/guns-admin/src/main/java/com/supersavedriving/driver/config/web/BeetlConfig.java

@@ -1,7 +1,7 @@
package com.supersavedriving.driver.config.web;

import com.supersavedriving.driver.config.properties.BeetlProperties;
import com.supersavedriving.driver.core.beetl.BeetlConfiguration;
import com.supersavedriving.driver.config.properties.BeetlProperties;
import org.beetl.core.resource.ClasspathResourceLoader;
import org.beetl.ext.spring.BeetlSpringViewResolver;
import org.springframework.beans.factory.annotation.Autowired;