Merge branch 'master_xieqiyu_fixbug' into 'master'

* Fix bug#29356,#29168.

See merge request easycorp/zentaopms!6062

module/story/config.php

@@ -50,7 +50,7 @@ $config->story->custom->createFields      = $config->story->list->customCreateFi
 $config->story->custom->batchCreateFields = 'module,plan,spec,pri,estimate,review,%s';
 $config->story->custom->batchEditFields   = 'branch,module,plan,estimate,pri,source,stage,closedBy,closedReason';
 
-$config->story->excludeCheckFileds = ',uploadImage,category,reviewer,reviewDitto,lanes,regions,';
+$config->story->excludeCheckFileds = ',uploadImage,category,reviewer,reviewDitto,lanes,regions,branch,pri,';
 
 global $lang, $app;
 $config->story->datatable = new stdclass();

module/story/lang/zh-cn.php

@@ -292,7 +292,7 @@ $lang->story->confirmDelete         = "您确认删除该{$lang->SRCommon}吗?";
 $lang->story->confirmRecall         = "您确认撤销该{$lang->SRCommon}吗?";
 $lang->story->errorEmptyChildStory  = "『细分{$lang->SRCommon}』不能为空。";
 $lang->story->errorNotSubdivide     = "状态不是激活，或者阶段不是未开始的{$lang->SRCommon}，或者是子需求，则不能细分。";
-$lang->story->errorEmptyReviewedBy  = "『由谁评审』不能为空。";
+$lang->story->errorEmptyReviewedBy  = "『评审者』不能为空。";
 $lang->story->mustChooseResult      = '必须选择评审意见';
 $lang->story->mustChoosePreVersion  = '必须选择回溯的版本';
 $lang->story->noStory               = "暂时没有{$lang->SRCommon}。";