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

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
This commit is contained in:
zyx.net
2023-03-09 15:36:57 +08:00
9 changed files with 260 additions and 18 deletions
+2
View File
@@ -1424,6 +1424,8 @@ module.exports = {
onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected',
confirmResetProcess:'Confirm reset process?',
confirmUrging:'Confirm urging ?',
confirmWithdrawal:'Confirm withdrawal ?',
onlyListCheckedCanRecalled:'Only the data whose process status is list to be checked can be recalled',
statusthetasistobeconfirmed:'You can withdraw the list only when the status of the list is to be checked or the status of the task is to be confirmed',
confirmreturn:'Confirm return ?',
}