Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 ce0651907f18a57dae80065e01589e975530f53e

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetOriginalController.java

@@ -37,7 +37,7 @@
 */
@Api(tags = "原始检测项管理")
@RestController
@RequestMapping("/t-test-method-confirm-sheet-original")
@RequestMapping("")
public class TTestMethodConfirmSheetOriginalController {

    private final TokenService tokenService;
@@ -57,8 +57,8 @@
    /**
     * 获取检验方法确认单管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:list')")
    @ApiOperation(value = "获取检验方法确认单分页列表")
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:list')")
    @ApiOperation(value = "获取检验方法确认单分页列表",  notes = "获取检验方法确认单分页列表",response = TTestMethodConfirmSheetOriginalQuery.class)
    @PostMapping(value = "/api/t-test-method-confirm-sheet-original/pageList")
    public R<PageInfo<TTestMethodConfirmSheetOriginalVO>> pageList(@RequestBody String param) {
        TTestMethodConfirmSheetOriginalQuery query = JSON.parseObject(param, TTestMethodConfirmSheetOriginalQuery.class);
@@ -68,7 +68,7 @@
    /**
     * 修改检验方法确认单
     */
    @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:edit')")
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:edit')")
    @Log(title = "检验方法确认单信息-修改检验方法确认单", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改检验方法确认单")
    @PostMapping(value = "/api/t-test-method-confirm-sheet-original/update")
@@ -87,7 +87,7 @@
    /**
     * 查看检验方法确认单详情
     */
    @PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:detail')")
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:detail')")
    @ApiOperation(value = "查看检验方法确认单详情")
    @GetMapping(value = "/open/t-test-method-confirm-sheet-original/getDetailById")
    public R<TTestMethodConfirmSheetOriginalVO> getDetailById(@RequestParam String id) {