Commit 25e3f274f01cf8c51f84b8c2c67e0bca1a116d90

Authored by 王通
2 parents a70718e0 3553e029

Merge branch 'pudong' into pudong_jdk8

# Conflicts:
#	src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
#	src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at