merge test

Merge pull request 'projects/mesxc-lb' (#209 ) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #209
2024-02-27 09:14:10 +08:00 · 2024-02-27 09:11:12 +08:00 · 2024-02-26 17:06:19 +08:00 · 2024-02-26 13:19:19 +08:00 · 2024-02-26 10:46:26 +08:00 · 2024-02-26 10:28:16 +08:00
1 changed files with 1 additions and 1 deletions
--- a/src/layout/components/NavbarRight.vue
+++ b/src/layout/components/NavbarRight.vue
@ -68,7 +68,7 @@ export default {
    getUserMsg() {
      let id = this.$store.getters.userId
      getUserSimple(id).then(res => {
-        this.dept = res.data.deptName ? res.data.dept.deptName : '---'
+        this.dept = res.data.deptName ? res.data.deptName : '---'
      })
    },
    async logout() {
Author	SHA1	Message	Date
juzi	a8013fce87	merge test	2024-02-27 09:14:10 +08:00
juzi	ad3a2cb1ae	Merge pull request 'projects/mesxc-lb' (#209 ) from projects/mesxc-lb into projects/mesxc-test Reviewed-on: #209	2024-02-27 09:11:12 +08:00
lb	6d3b41a394	Merge branch 'projects/mesxc-test' into projects/mesxc-lb	2024-02-26 17:06:19 +08:00
juzi	007cf5e638	Merge pull request '订单bug' (#208 ) from projects/mesxc-zjl into projects/mesxc-test Reviewed-on: #208	2024-02-26 13:19:19 +08:00
juzi	2c12a26e64	Merge pull request 'projects/mesxc-zjl' (#207 ) from projects/mesxc-zjl into projects/mesxc-test Reviewed-on: #207	2024-02-26 10:46:26 +08:00
lb	512986faf6	fix navbar right	2024-02-26 10:28:16 +08:00