|
|
@@ -160,37 +160,10 @@
|
|
|
<artifactId>slf4j-nop</artifactId>
|
|
|
<version>1.7.21</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
-
|
|
|
</dependencies>
|
|
|
<build>
|
|
|
<plugins>
|
|
|
<!-- 自动生成代码文件 -->
|
|
|
-<<<<<<< HEAD
|
|
|
-<!-- <plugin>-->
|
|
|
-<!-- <groupId>com.steerinfo</groupId>-->
|
|
|
-<!-- <artifactId>generator-maven-plugin</artifactId>-->
|
|
|
-<!-- <version>3.0</version>-->
|
|
|
-<!-- <configuration>-->
|
|
|
-<!-- <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>-->
|
|
|
-<!-- <user>dil</user>-->
|
|
|
-<!-- <password>Dil123789</password>-->
|
|
|
-<!-- <!–包名–>-->
|
|
|
-<!-- <targetPackage>com.steerinfo.dil</targetPackage>-->
|
|
|
-<!-- <tables>-->
|
|
|
-<!--<!– <param>AMS_DISPATCH_SALE_ORDER</param><!–销售计划–>–>-->
|
|
|
-<!-- </tables>-->
|
|
|
-<!-- </configuration>-->
|
|
|
-<!-- <executions>-->
|
|
|
-<!-- <execution>-->
|
|
|
-<!-- <phase>compile</phase>-->
|
|
|
-<!-- <goals>-->
|
|
|
-<!-- <goal>steerinfo</goal>-->
|
|
|
-<!-- </goals>-->
|
|
|
-<!-- </execution>-->
|
|
|
-<!-- </executions>-->
|
|
|
-<!-- </plugin>-->
|
|
|
-=======
|
|
|
<plugin>
|
|
|
<groupId>com.steerinfo</groupId>
|
|
|
<artifactId>generator-maven-plugin</artifactId>
|
|
|
@@ -214,7 +187,6 @@
|
|
|
</execution>
|
|
|
</executions>
|
|
|
</plugin>
|
|
|
->>>>>>> 513e47be307d0cb1ce7dbbbb30ed768eaa3329b4
|
|
|
<plugin>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
|
@@ -234,7 +206,6 @@
|
|
|
<include>**/*.xml</include>
|
|
|
</includes>
|
|
|
</resource>
|
|
|
-
|
|
|
<resource>
|
|
|
<directory>src/main/resources</directory>
|
|
|
</resource>
|
Your Name