Merge remote-tracking branch 'origin/master'

puzhibing

2026-02-13 fa8c307d59388c9f7c64a60b08585a4c4b2da770

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpElectronicFenceController.java

@@ -111,9 +111,9 @@
    /**
     * 电子围栏详情
     */
    @GetMapping("/queryById")
    @PostMapping("/queryById")
    @ApiOperation(value = "电子围栏详情")
    public R<ElectronicFenceDetailVo> queryById(Long id) {
    public R<ElectronicFenceDetailVo> queryById(@RequestParam("id")Long id) {
        ElectronicFenceDetailVo res = new ElectronicFenceDetailVo();
        XpElectronicFence electronicFence = xpElectronicFenceService.getById(id);
        if (electronicFence == null) {
@@ -142,10 +142,10 @@
    /**
     * 复制电子围栏
     */
    @GetMapping("/copy")
    @PostMapping("/copy")
    @ApiOperation(value = "复制电子围栏")
    @Transactional
    public R copy(Integer id) {
    public R<Long> copy(@RequestParam("id") Integer id) {
        XpElectronicFence electronicFence = xpElectronicFenceService.getById(id);
        if (electronicFence.getStatus()==2){
            throw new ServiceException(
@@ -166,7 +166,7 @@
            area.setAreaName("副本_"+area.getAreaName());
        }
        xpElectronicFenceAreaService.saveBatch(electronicFenceAreaList);
        return R.ok();
        return R.ok(electronicFence.getId());
    }

    /**