Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop

pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js

@@ -257,7 +257,7 @@ class SalaryItemSettings extends Component {
             ...item,
             items: _.map(item.items, child => {
               if (child.salaryItemId === salaryItemId) {
-                return { ...child, salaryItemShowName: name, name };
+                return { ...child, salaryItemShowName: name, name: name ? name : child.originName };
               }
               return { ...child };
             })