Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/web/common/system/SystemDictController.java

@@ -3,7 +3,6 @@ package com.yihu.wlyy.web.common.system;
import com.yihu.wlyy.entity.dict.SystemDict;
import com.yihu.wlyy.service.system.SystemDictService;
import com.yihu.wlyy.web.BaseController;
import com.yihu.wlyy.web.manager.Index;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -51,12 +50,12 @@ public class SystemDictController extends BaseController {
        }
    }
    @RequestMapping(value = "/test",method = RequestMethod.GET)
    @ApiOperation("测试方法")
    @ResponseBody
    public Index index(
            @ApiParam(name="name",required = false,value = "参数") @RequestParam(required = false,name = "name") String name
    ) {
        return new Index();
    }
//    @RequestMapping(value = "/test",method = RequestMethod.GET)
//    @ApiOperation("测试方法")
//    @ResponseBody
//    public Index index(
//            @ApiParam(name="name",required = false,value = "参数") @RequestParam(required = false,name = "name") String name
//    ) {
//        return new Index();
//    }
}