canrd-main / canrd-erp-front · Commits

Commit 8586bf0f94805adea7e812f6e98b1be3fe09a398

Authored by boyang
2 parents 9d2cc6bc 0ef6ed3f
build: skipped

Merge branch 'warningNew' 

# Conflicts:
#	src/pages/Order/Order/components/FeedbackRegistrationModal.tsx
#	src/pages/Order/OrderList/FeedbackRegistrationModal.tsx
#	src/pages/Order/OrderWarning/components/FeedbackRegistrationModal.tsx
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at