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

src/pages/Container/EnterpriseInfo/ResignationApply/index.js

@@ -56,7 +56,7 @@ function ResignationApplyPage(props) {
   useEffect(() => {
     let cancelled = false;
     props
-      .staffInfoList?.({ current: 1, size: 500 })
+      .staffInfoList?.({ current: 1, size: 500, employmentStatusCode: 1 })
       .then((res) => {
         if (!cancelled) {
           setStaffOptions(
@@ -240,8 +240,6 @@ function AddModal({ open, staffOptions, requestAdd, onCancel, onSuccess }) {
         message.success("提交成功");
         handleCancel();
         onSuccess();
-      } else {
-        message.error(res?.message || "提交失败");
       } 
     } catch {
       // validation error