Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

zhibing.pu

2024-07-25 01d8de48c76467ff3b99b204e66d3ef86506fa52

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java

@@ -82,9 +82,9 @@
     */
    @RequestMapping("/user")
    public String userIndex(Model model) {
        TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 3));
        TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 3).eq("language",1));
        model.addAttribute("one",one);
        TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 3));
        TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 3).eq("language",1));
        model.addAttribute("two",two);
        return PREFIX + "tAgreementUser.html";
    }
@@ -157,9 +157,9 @@
     */
    @RequestMapping("/showCommonProblem")
    public String showCommonProblem(Model model) {
        TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 12));
        TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",1).eq("type", 12).eq("language",1));
        model.addAttribute("one",one);
        TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 12));
        TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType",2).eq("type", 12).eq("language",1));
        model.addAttribute("two",two);
        return PREFIX + "commonProblem.html";
    }