fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/ZqErpApplication.java

@@ -3,6 +3,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableAsync;

/**
 * spring boot入口
@@ -10,9 +11,8 @@
 * @author jiangyouyao
 */
@SpringBootApplication

@ComponentScan(basePackages = {"com.matrix.**"})

@EnableAsync
public class ZqErpApplication {

    public static void main(String[] args) {