Merge branch 'gyj' into test
# Conflicts: # eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
This commit is contained in:
@@ -66,7 +66,6 @@ public class SummaryController {
|
||||
}
|
||||
|
||||
@GetMapping("/table")
|
||||
@AnonymousGetMapping
|
||||
private Object shopSummaryTable(@RequestParam Integer shopId,
|
||||
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
|
||||
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) {
|
||||
@@ -74,7 +73,6 @@ public class SummaryController {
|
||||
}
|
||||
|
||||
@PostMapping("/table/download")
|
||||
@AnonymousPostMapping
|
||||
private void downloadShopSummaryTable(HttpServletResponse response, @RequestBody ShopTableSaleInfoDto exportRequest) throws IOException {
|
||||
summaryService.downloadTableSaleInfo(exportRequest, response);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user