Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
147c0365f2
|
|
@ -37,7 +37,7 @@ public class EngineeringSafetyAnalysisController extends BaseController {
|
||||||
public TableDataInfo list(EngineeringSafetyAnalysis environmentalReadings) {
|
public TableDataInfo list(EngineeringSafetyAnalysis environmentalReadings) {
|
||||||
startPage();
|
startPage();
|
||||||
List<EngineeringSafetyAnalysis> list = environmentalReadingsService.selectEnvironmentalReadingsList(environmentalReadings);
|
List<EngineeringSafetyAnalysis> list = environmentalReadingsService.selectEnvironmentalReadingsList(environmentalReadings);
|
||||||
return getDataTable(list);
|
return getDataTableLayui(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -69,7 +69,7 @@ public class EngineeringSafetyAnalysisController extends BaseController {
|
||||||
public TableDataInfo getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings) {
|
public TableDataInfo getEnvironmentalList(EngineeringSafetyAnalysis environmentalReadings) {
|
||||||
startPage();
|
startPage();
|
||||||
List<EngineeringSafetyAnalysis> list = environmentalReadingsService.getEnvironmentalList(environmentalReadings);
|
List<EngineeringSafetyAnalysis> list = environmentalReadingsService.getEnvironmentalList(environmentalReadings);
|
||||||
return getDataTable(list);
|
return getDataTableLayui(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -80,6 +80,6 @@ public class EngineeringSafetyAnalysisController extends BaseController {
|
||||||
public TableDataInfo getHazardsList(EngineeringSafetyAnalysis environmentalReadings) {
|
public TableDataInfo getHazardsList(EngineeringSafetyAnalysis environmentalReadings) {
|
||||||
startPage();
|
startPage();
|
||||||
List<EngineeringSafetyAnalysis> list = environmentalReadingsService.getHazardsList(environmentalReadings);
|
List<EngineeringSafetyAnalysis> list = environmentalReadingsService.getHazardsList(environmentalReadings);
|
||||||
return getDataTable(list);
|
return getDataTableLayui(list);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue