From 32e2c1f5097f36fe37ea2969f6337d24f55576f4 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 24 六月 2023 18:24:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 9 +++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 325f280..3768939 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -5,6 +5,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.Date;
+
/**鏌ヨ鐢ㄦ埛璇︽儏鏁版嵁*/
@Data
@@ -37,6 +39,9 @@
private Integer isHaveShop;
/**鏄惁鏈夐【闂�*/
private Integer isHaveCorp;
- /*寮�鍗曞钩鍙帮紝鏉ユ簮搴旂敤appId*/
- private String appId;
+
+ private Date startTime;
+
+ private Date endTime;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 34dc498..cb058e1 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -295,4 +295,10 @@
* */
@PostMapping(value = "/user/first/day/consumption")
Result firstDayConsumption(@RequestBody UserDto userDto);
+
+ /**
+ * 鏌ヨ鐢ㄦ埛棣栧ぉ娑堣垂绱
+ * */
+ @PostMapping(value = "/user/accumulat/consumption")
+ Result accumulateConsumption(@RequestBody UserDto userDto);
}
\ No newline at end of file
--
Gitblit v1.8.0