Merge branch 'dev_2nd_period_test' into 'feature_dev_20221010_extend'

# Conflicts: # jero-web/src/common/lang/en-us.js # jero-web/src/common/lang/zh-cn.js
2022-11-03 14:32:08 +08:00
parent f0f977ebaa 7f3c977464
commit 3f7ad00c1d
83 changed files with 4488 additions and 1347 deletions
@@ -1360,4 +1360,5 @@ module.exports = {
  cancelTopping:'Cancel Topping',
  relatedProjectVersion:'Related project version',
  Importfailure:'Import failure',
+  CuiBan:'CuiBan',
 }