canrd-outside / order-erp · Commits

Commit 5c716366612e64e7ad25dfcd2fc7658faf2e1518

Authored by chenhang4442024
2 parents a12271e6 5985ab52
build: skipped

Merge branch 'develop-test' into develop 

# Conflicts:
#	src/main/java/com/order/erp/common/constant/Constant.java
#	src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java
#	src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
#	src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
#	src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
#	src/main/java/com/order/erp/service/order/impl/OrderProfitAnalysisServiceImpl.java
#	src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java
#	src/main/resources/application.yml
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at