Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

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