diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java index d2d3bd4b..3b5d164a 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java @@ -40,11 +40,11 @@ public class DmsBaseDeviceSuplierController extends BaseController */ @RequiresPermissions("dms:suplier:list") @GetMapping("/list") - public TableDataInfo list(DmsBaseDeviceSuplier dmsBaseDeviceSuplier) + public List list(DmsBaseDeviceSuplier dmsBaseDeviceSuplier) { // startPage(); List list = dmsBaseDeviceSuplierService.selectDmsBaseDeviceSuplierList(dmsBaseDeviceSuplier); - return getDataTable(list); + return list; } //todo 新加一个con 拿掉分页 diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml index 0d660938..f01b8a62 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml @@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.inspect_status = #{inspectStatus} and a.is_flag = #{isFlag} + order by create_time desc