Merge branch 'order-update' into dev

yudao-server/src/main/resources/i18n/messages_en.properties

@@ -1069,4 +1069,15 @@ score.rule.orderentry.error = order entry must not null
 score.rule.first.order.error = firstOrder must 0 or 1
 
 user.address.not.exists = user address not exists
-user.address.field.error = user address field error:{}
+user.address.field.error = user address field error:{}
\ No newline at end of file
+
+
+consignee.limit.update.processing=The consignee restriction modification application is in progress
+consignee.limit.update.pass=The consignee's restriction modification approval has been approved
+consignee.limit.update.reject=Recipient restriction modification approval rejection
+consignee.limit.update.cancel=Consignee restriction modification approval cancellation
+
+overseas.warehouse.update.processing=Overseas warehouse modification application in progress
+overseas.warehouse.update.pass=Overseas warehouse modification approval passed
+overseas.warehouse.update.reject=Overseas warehouse modification approval rejected
+overseas.warehouse.update.cancel=Overseas warehouse modification approval cancelled