Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

# Conflicts: # jero-web/src/common/lang/en-us.js
2023-03-21 11:02:35 +08:00
parent d02f13ce14 275595c743
commit 26b0ab46d5
11 changed files with 225 additions and 51 deletions
@@ -1679,4 +1679,7 @@ module.exports = {
  pleaseStateTheDistribution:'Please describe the integration and distribution of the management system and electronic controller',
  next:'Next',
  last:'Last',
+  designComplianceReviewAdmin:'Design Compliance Review',
+  missionAccomplished:'Mission Accomplished',
+
 }