From eab899c4fe225961e5ccf43ea8db67af4efb4284 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 24 十月 2023 19:10:15 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java
index d92a6b9..a136d67 100644
--- a/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/common/DCommonDto.java
@@ -10,23 +10,42 @@
@Data
public class DCommonDto {
/**鎿嶄綔浜烘爣璇�*/
- String operateId;
+ private String operateId;
/**鎿嶄綔浜哄悕绉�*/
- String operateMan;
+ private String operateMan;
+ /**鎿嶄綔浜洪棬搴楁爣璇�*/
+ private String opShopId;
+ /**鎿嶄綔浜洪棬搴楀悕绉�*/
+ private String opShopName;
+ /**鎿嶄綔浜鸿鑹叉爣璇�(EmployeeRole)*/
+ private String opRoleId;
+ /**鎿嶄綔浜鸿鑹插瓧绗︿覆*/
+ private String opRoleStr;
+ /**鎿嶄綔浜鸿鑹插悕绉�*/
+ private String opRoleName;
+ /**澶囨敞*/
+ private String opRemark;
- /**鎼滅储*/
- private String searchData;
- /**寮�濮�*/
+
+ /**寮�濮嬫椂闂�*/
private String startTime;
- /**缁撴潫*/
+ /**缁撴潫鏃堕棿*/
private String endTime;
- /**鍏抽敭瀛�*/
+
+ /**鎼滅储鍏抽敭瀛�*/
+ private String searchData;
+ /**鎼滅储鍏抽敭瀛�*/
private String keyWord;
+
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
/**鐢ㄦ埛淇℃伅鍏抽敭瀛�*/
private String userKeyWord;
/**鐢ㄦ埛鏍囪瘑*/
- private String userId;
+ private List<String> userIdList;
/**闂ㄥ簵鏍囪瘑*/
private List<String> shopIdList;
+ /**鍛樺伐鏍囪瘑*/
+ private List<String> employeeIdList;
}
--
Gitblit v1.8.0