Merge remote-tracking branch 'origin/master'

- 调整对象展开顺序确保新数据覆盖旧数据
- 修复了资质详情信息可能被错误覆盖的问题

src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js

@@ -319,7 +319,7 @@ const StepTwoComponent = forwardRef((props, ref) => {
       const newSpecialList = data.details.map((item) => {
         const existsItem = specialList.find(specialItem => specialItem.qualificationsDetailId === item.id);
         if (existsItem) {
-          return { ...item, ...existsItem };
+          return { ...existsItem, ...item };
         }
         return item;
       });