xtrade / order-service · Commits

Commit 19ae0675f7713c8e8988aecda3d12579572cb828

Authored by yangfan
2 parents 5b8f7310 c5984e0d
build: skipped

Merge branch 'master' of http://git3.nong12.com/xtrade/order-service 

# Conflicts:
#	src/main/java/com/diligrp/xtrade/product/controllor/CategoryController.java
#	src/main/java/com/diligrp/xtrade/product/controllor/ShopController.java
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at