Merge branch 'main' of http://42.192.7.176:3000/suojin/transport_integrated_app into main

pages/roadTransport/transportData/form.vue

@@ -645,7 +645,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
 				// this.$request(getApp().globalData.baseUrl + '/api/user/getByDeptId/' + this.unitId,{},"GET").then(res =>{
 					console.log('人员列表 ===>',res)
 					res.data.map(item =>{
-						this.peopleList.push({id:item.id,people:item.nickname + ',' + item.mobile})
+						this.peopleList.push({id:item.id,people:item.username + ',' + item.mobile})
 					})
 					if(this.pageType == 'edit'){
 						console.log('deptNameList ===>',this.peopleList)