Commit fc64951bb87d0f2287384576702c927334b404d7

Authored by 王通
1 parent 25e3f274

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