Merge branch 'hotfix/2.8.3.2308.01' into develop

# Conflicts:
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js

pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js

@@ -21,7 +21,7 @@ export default class BaseForm extends React.Component {
       { com: Input("岗位", position) },
       { com: Input("手机号", telephone) },
       { com: Input("入职日期", hiredate) },
-      { com: Input("合同到期日期", dimissionDate) }
+      // { com: Input("合同到期日期", dimissionDate) }
     ];
     const taxagentItems = [
       { com: Input("个税扣缴义务人", paymentOrganizationName) }

pc4mobx/hrmSalary/pages/socialSecurityBenefits/programme/customBenefitsTable.js

@@ -125,7 +125,7 @@ class CustomBenefitsTable extends Component {
       content: getLabel(543231, "确认删除本条数据吗?"),
       onOk: () => {
         message.destroy();
-        message.loading("正在删除中...", 0);
+        message.loading(getLabel(529063, "正在删除中..."), 0);
         const payload = { id };
         deleteCustomCategory(payload).then(({ status, errormsg }) => {
           message.destroy();