From b4a8efb1623db8f771ac6491ca9fa756acbf0a0e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 7 Mar 2022 16:35:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=88=86=E7=B1=BB-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=BF=94=E5=9B=9E=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/wkflow/controller/workFlowController.java | 4 ++-- .../java/com/jero/modules/wkflow/entity/Category.java | 8 +++----- .../modules/wkflow/feginClient/WorkFlowFeignClient.java | 2 +- .../wkflow/feginClient/impl/WorkFlowFeignClientImpl.java | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index 463c7c900..cc23fa6fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -116,8 +116,8 @@ public class workFlowController { return workFlowFeignClient.forceRecall(prcId); } - @AutoLog(value = "查询流程") - @ApiOperation(value="查询流程", notes="查询流程") + @AutoLog(value = "查询流程列表") + @ApiOperation(value="查询流程列表", notes="查询流程列表") @GetMapping("/modelListPage") public Result> modelListPage(@RequestParam(value="name",required = false)String name, @RequestParam(value="category_id ",required = false)String category_id, @RequestParam("current")int current, @RequestParam("size")int size){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/Category.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/Category.java index b1f011939..5618cd1a9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/Category.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/Category.java @@ -1,14 +1,12 @@ package com.jero.modules.wkflow.entity; -import java.util.Date; - public class Category { private String objectId; private int isDeleted; - private Date createTime; + private String createTime; private String code; @@ -30,11 +28,11 @@ public class Category { this.isDeleted = isDeleted; } - public Date getCreateTime() { + public String getCreateTime() { return createTime; } - public void setCreateTime(Date createTime) { + public void setCreateTime(String createTime) { this.createTime = createTime; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index e1f4cddbf..11693c225 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -106,7 +106,7 @@ public interface WorkFlowFeignClient { Result forceRecall(@RequestParam("prcId") String prcId); /** - * 查询流程 + * 查询流程列表 * @param name * @param category_id * @param current diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java index cd8b1ddb6..23336fbab 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/impl/WorkFlowFeignClientImpl.java @@ -126,7 +126,7 @@ public class WorkFlowFeignClientImpl{ } /** - * 查询流程 + * 查询流程列表 * @param name * @param category_id * @param current