设备保养记录优化

application/api/controller/MachineList.php

@@ -578,9 +578,9 @@ class MachineList extends Api
         if (empty($param) || !isset($param['UniqId'])) {
             $this->error('参数错误');
         }
-        $field = 'rtrim(a.设备编号) as 设备编号,rtrim(a.设备名称) as 设备名称,rtrim(a.使用部门) as 使用部门,rtrim(a.保养类型) as 保养类型,a.保养开始时间,a.保养结束时间,
-        a.保养工时,rtrim(a.执行机修) as 执行机修,b.员工编号 as 执行机修姓名,a.执行机长,c.员工姓名 as 执行机长姓名,rtrim(a.保养备注) as 保养备注,rtrim(a.验收人员) as 验收人员,
-        d.员工姓名 as 验收人员姓名,rtrim(a.验收备注) as 验收备注,rtrim(a.验收情况) as 验收情况,a.UniqId';
+        $field = 'rtrim(a.设备编号) as 设备编号,rtrim(a.设备名称) as 设备名称,rtrim(a.使用部门) as 使用部门,rtrim(a.保养类型) as 保养类型,a.保养开始时间,
+        a.保养结束时间,a.保养工时,rtrim(a.执行机修) as 执行机修,b.员工姓名 as 执行机修姓名,a.执行机长,c.员工姓名 as 执行机长姓名,rtrim(a.保养备注) as 保养备注,
+        rtrim(a.验收人员) as 验收人员,d.员工姓名 as 验收人员姓名,rtrim(a.验收备注) as 验收备注,rtrim(a.验收情况) as 验收情况,a.UniqId';
         $query = db('设备_保养记录')
             ->alias('a')
             ->join('人事_基本资料 b','a.执行机修 = b.员工编号','left')