Merge branch 'dev_zufangUpdate' into dev

# Conflicts: # src/views/components/editResi.vue
3 years ago · 13530b46c3
1 changed files with 1 additions and 0 deletions
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@ -311,6 +311,7 @@
 import { isCard, isMobile, isPhone } from '@/utils/validate'
 import { requestPost } from "@/js/dai/request";

+
 export default {
  name: 'editForm',
  props: {