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

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/ZlptCompanyApplication.java

@@ -5,6 +5,7 @@ import com.bonus.zlpt.common.security.annotation.EnableRyFeignClients;
 import com.bonus.zlpt.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
 
 /**
  * Description: 企业模块启动类
@@ -17,6 +18,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableCustomSwagger2
 @EnableRyFeignClients
 @SpringBootApplication
+@Import({com.bonus.zlpt.home.service.impl.MaTypeInfoServiceImpl.class})
 public class ZlptCompanyApplication {
     public static void main(String[] args) {
         SpringApplication.run(ZlptCompanyApplication.class, args);

zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/MaUpOffController.java

@@ -37,7 +37,7 @@ public class MaUpOffController extends BaseController {
     @Resource
     private MaUpOffMapper maUpOffMapper;
 
-    @Autowired(required = false)
+    @Autowired
     private MaTypeInfoSevice maTypeInfoSevice;
 
     /**