From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 29 八月 2025 09:18:52 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAgreeController.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAgreeController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAgreeController.java index 6ac41f4..bbdd362 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAgreeController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAgreeController.java @@ -53,22 +53,22 @@ Protocol three = protocolService.getOne(new LambdaQueryWrapper<Protocol>().eq(Protocol::getType, 3)); Protocol four = protocolService.getOne(new LambdaQueryWrapper<Protocol>().eq(Protocol::getType, 4)); Protocol five = protocolService.getOne(new LambdaQueryWrapper<Protocol>().eq(Protocol::getType, 5)); - Protocol six = protocolService.getOne(new LambdaQueryWrapper<Protocol>().eq(Protocol::getType, 6)); + Protocol seven = protocolService.getOne(new LambdaQueryWrapper<Protocol>().eq(Protocol::getType, 7)); model.addAttribute("one",one); model.addAttribute("two",two); model.addAttribute("three",three); model.addAttribute("four",four); model.addAttribute("five",five); - if (six == null){ + if (seven == null){ Protocol protocol = new Protocol(); - protocol.setType(6); + protocol.setType(7); protocol.setContent(""); protocol.setInsertTime(new Date()); protocolService.save( protocol); - model.addAttribute("six",protocol); + model.addAttribute("seven",protocol); }else{ - model.addAttribute("six",six); + model.addAttribute("seven",seven); } return PREFIX + "tAgreementDriver.html"; -- Gitblit v1.7.1