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

# Conflicts:
#	.nuxt/dist/client/pages/sign/new_v2/01e7b97c.dbbb833.css
#	.nuxt/dist/client/runtime.4157f15.js
#	.nuxt/dist/server/client.manifest.json
#	.nuxt/dist/server/index.spa.html
#	.nuxt/dist/server/pages/kaifain/add/index.js.map
#	.nuxt/dist/server/pages/otherpage/companyVerifyInput/index.js.map
#	.nuxt/dist/server/pages/sign/new_v2.js
#	.nuxt/dist/server/pages/sign/new_v2.js.map

components/sign/step-education.vue

@@ -204,7 +204,10 @@ export default {
         if (it.id) {
           item1.id = it.id;
         }
-        return item1;
+        return {
+          ...it,
+          ...item1
+        };
       });
       const res = await this.$axios.$post("/api/user_education/save_all", {
         data: JSON.stringify(data)