修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -449,9 +449,9 @@ public class OrgPersonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/people/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
-    public ResponseModel<PeopleInfoDto> selectPeopleById(@PathVariable Long id) {
+    public ResponseModel<PeopleInfoDto> selectPeopleById(@PathVariable String id) {
 
-        PeopleInfoDto peopleInfoDto =iOrgUsrService.selectPeopleById(id);
+        PeopleInfoDto peopleInfoDto =iOrgUsrService.selectPeopleById(Long.valueOf(id));
         return ResponseHelper.buildResponse(peopleInfoDto);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

@@ -533,7 +533,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
             }
             page.setRecords(response.getResult());
         }
-        return new Page<>();
+        return page;
     }
 
 }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml

@@ -270,8 +270,8 @@
         SELECT
             id as id,
             equipment_specific_index_name AS alarmType,
-            create_date AS alarmDate,
-            clean_time AS cleanTime,
+            date_format(create_date, '%Y-%m-%d %H:%i:%s') AS alarmDate,
+            date_format(clean_time, '%Y-%m-%d %H:%i:%s') AS cleanTime,
             concat( equipment_specific_name, equipment_specific_index_name ) AS alarmContent,
             ( CASE clean_time is NULL  WHEN TRUE THEN '未消除' ELSE '已消除' END ) AS clearStatus
         FROM