Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-09-21 ff3af3a0dd0fe87a500c13e933bea1f553083508

 screen-manage/src/main/java/com/moral/api/controller/GovMonitorPoionController.java

@@ -12,10 +12,7 @@
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

@@ -97,6 +94,16 @@
        return ResultMessage.ok();
    }

    @GetMapping("updateGuid")
    @ApiOperation(value = "更新站点编号", notes = "更新站点编号")
    public ResultMessage updateGuid(@RequestParam @ApiParam(value = "id",name = "主键id") Integer id,
                                    @RequestParam @ApiParam(value = "guid",name = "站点编号") String guid) {

        govMonitorPointService.updateList(id,guid);
        return ResultMessage.ok();
    }


    @RequestMapping(value = "delete", method = RequestMethod.POST)
    @ResponseBody
    public ResultMessage delete(@RequestBody Map map) {