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

2024-01-11 10:13:16 +08:00
parent 1c9f135ec3 7b9574a35a
commit 45d7f9b699
3 changed files with 2 additions and 2 deletions
--- a/src/project/biaopin/AppResidentAssistant/AppResidentAssistant.vue
+++ b/src/project/biaopin/AppResidentAssistant/AppResidentAssistant.vue
--- a/src/project/biaopin/AppMine/userInfo.vue
+++ b/src/project/biaopin/AppMine/userInfo.vue
@@ -161,7 +161,7 @@ export default {
        avatarUrl: this.avatarUrlList[0].url,
        nickName: this.userName,
        phone: this.userPhone,
-        name: this.userRealName,
+        name: this.userName,
        idNumber: this.userIdNumber,
        girdId: this.userGirdId,
        girdName: this.userGirdName
--- a/src/project/fengdu/AppMine/userInfo.vue
+++ b/src/project/fengdu/AppMine/userInfo.vue
@@ -155,7 +155,7 @@ export default {
        avatarUrl: this.avatar,
        nickName: this.userName,
        phone: this.userPhone,
-        name: this.userRealName,
+        name: this.userName,
        idNumber: this.userIdNumber,
        girdId: this.userGirdId,
        girdName: this.userGirdName