168.1.220:10080/jiwei/wlyy2.0 into dev · 5c26e37ecd - Gogs: Go Git Service

Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

Conflicts:
	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

yeshijie 6 years ago

parent

2dac9b7214

commit

5c26e37ecd

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
wlyy-lib-parent-pom/pom.xml
							 
								View File
							
				@ -25,6 +25,7 @@
			
				        <module>../common/common-util</module>
			
				        <module>../common/common-fegin</module>
			
				        <module>../common/common-web</module>
			
				        <module>../common/common-tracer</module>
			
				    </modules>
			
				</project>