From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java
index bea1b7c..c41f551 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcShiftController.java
@@ -112,7 +112,7 @@
*/
@AutoLog("鐝埗琛�(涓昏〃)-鍔犺浇鐝埗涓嬫媺閫夐」")
@ApiOperation(value = "鐝埗琛�(涓昏〃)-鍔犺浇鐝埗涓嬫媺閫夐」", notes = "鐝埗琛�(涓昏〃)-鍔犺浇鐝埗涓嬫媺閫夐」")
- @GetMapping("/deleteShift")
+ @GetMapping("/initShiftList")
public Result<List<Map<String, String>>> initShiftList() {
List<Map<String, String>> result = mdcShiftService.initShiftList();
return Result.OK(result);
@@ -126,7 +126,7 @@
*/
@AutoLog("鐝埗琛�(涓昏〃)-璁剧疆榛樿鐝埗")
@ApiOperation(value = "鐝埗琛�(涓昏〃)-璁剧疆榛樿鐝埗", notes = "鐝埗琛�(涓昏〃)-璁剧疆榛樿鐝埗")
- @GetMapping("/changeDefaultShift")
+ @PostMapping("/changeDefaultShift")
public Result<?> changeDefaultShift(@RequestParam(name = "id", required = true) String id) {
boolean result = mdcShiftService.changeDefaultShift(id);
return result ? Result.OK("璁剧疆鎴愬姛锛�") : Result.error("璁剧疆澶辫触锛�");
--
Gitblit v1.9.3