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

宁夏测试问题修改
2024-06-17 17:03:46 +08:00 · 2024-06-17 17:03:40 +08:00
1 changed files with 1 additions and 1 deletions
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@ -535,7 +535,7 @@
      tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
      bpl.lot_id as proId,bpl.lot_name as proName,
      bui.unit_id as unitId,bui.unit_name as unitName,
-      lai.lease_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,su.user_name as applyFor,d.`name` as taskName,
+      lai.lease_person as leasePerson, lai.phone as leasePhone,lai.lease_type as leaseType, lai.estimate_lease_time as estimateLeaseTime,su.nick_name as applyFor,d.`name` as taskName,
      case when d.id = '31' then lai.company_audit_remark
      when d.id = '32' then lai.dept_audit_remark
      when d.id = '33' then lai.direct_audit_remark
Author	SHA1	Message	Date
csyue	69bbdf63b0	Merge remote-tracking branch 'origin/dev-nx' into dev-nx	2024-06-17 17:03:46 +08:00
csyue	a43c4bf040	宁夏测试问题修改	2024-06-17 17:03:40 +08:00