From 7a393cea127859281a4edd08d6f75630a8d429a5 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: 星期二, 26 九月 2023 16:32:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java
index 1e422db..f170694 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/ViolationRegistrationController.java
@@ -1,7 +1,5 @@
package com.gkhy.exam.noncoalmine.controller;
-
-
import com.gkhy.exam.noncoalmine.model.addForm.ViolationRegistrationAddForm;
import com.gkhy.exam.noncoalmine.model.modForm.ViolationRegistrationModForm;
import com.gkhy.exam.noncoalmine.model.query.ViolationRegistrationQuery;
@@ -48,6 +46,7 @@
@ApiImplicitParam(name = "name", dataTypeClass = String.class,value = "姓名"),
@ApiImplicitParam(name = "idCard", dataTypeClass = String.class,value = "身份证号"),
@ApiImplicitParam(name = "operateTypeId", dataTypeClass = Long.class,value = "作业类型Id"),
+ @ApiImplicitParam(name = "isCm", dataTypeClass = Long.class,value = "是否为煤矿：0为非，1是"),
})
@GetMapping("page/list")
public TableDataInfo listByPage(ViolationRegistrationQuery query) {
--
Gitblit v1.9.2