Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2024-03-28 1a2258c4eca2e7514b6096004fa1c3e0036b402b

 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);