From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001 From: ke <893754509@qq.com> Date: Tue, 26 Nov 2024 16:02:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev --- skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java index d812b28..62f1f0f 100644 --- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java +++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java @@ -37,6 +37,7 @@ * 工序类型 */ private String gxType; + private String typeName; /** * 工序名 */ @@ -53,12 +54,17 @@ /** * 用户所在单位 */ - private Long userUnit; + private List<String> userUnit; /** * 县单位位 */ - private Long countryUnit; + private List<String> countryUnit; + private List<String> selfUnit; + /** + * 设备施工单位 + */ + private List<String> sgUnit; /** * 用户角色 @@ -159,5 +165,9 @@ * 是否单位过滤 1不过滤 */ private Integer isUnit; + /** + * 施工单位 + */ +// private String selfUnit; } -- Gitblit v1.9.3