Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-06-03 9c19d5222d91bb191808d868aa056bfedbacb0c9

 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;