测试git冲突

liurunyu

2023-12-01 88cd0922634e6bb20da6ea64209bd62d094b6b4c

 pipIrr-platform/pipIrr-web/pipIrr-web-demo/src/main/java/com/dy/pipIrrDemo/demo/DemoCtrl.java

@@ -66,7 +66,7 @@
            )
    })
    @GetMapping("info/{id}/")
    //http://127.0.0.1:8080/base/demo/info/123234234/?name=张三
    //http://127.0.0.1:8000/demo/demo/info/123234234/?name=张三
    @SsoAop(power="123456", ifAllPower = {"123", "456"})
    public BaseResponse<String> info(@PathVariable String id, @RequestParam String name) throws GlException{
        if(name == null || name.trim().equals("")){
@@ -96,7 +96,7 @@
    ))
    @PostMapping(value = "test", consumes = "application/json")
    //@RequestMapping(value="test", method = RequestMethod.POST, consumes = "application/json")
    //http://127.0.0.1:8080/base/demo/test/{"id":123456789,"age":12,"name":"test","tel":"1230987654"}
    //http://127.0.0.1:8000/demo/demo/test/{"id":123456789,"age":12,"name":"test","tel":"1230987654"}
    public BaseResponse<DemoTest> test(@RequestBody DemoTestVo req){
        DemoTest po = new DemoTest() ;
        po.id = System.currentTimeMillis() ;