From 9645ca1ea0ca880eff9bb0ba2138fad2b012f3e1 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期一, 18 十二月 2023 17:30:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index c53ce61..488cfb3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -78,7 +78,7 @@
*鎵归噺鍒犻櫎缁勭粐鏁版嵁
* @return
*/
- public static BaseResponse delBatchOrg(OrgDelRequest param){
+ public static BaseResponse<List<OrgUpdateFailureResponse>> delBatchOrg(OrgDelRequest param){
log.info("銆愭捣搴峰垹闄ょ粍缁囥��================寮�濮�===="+JSONObject.toJSONString(param));
try {
@@ -151,13 +151,13 @@
*鎵归噺鍒犻櫎浜哄憳淇℃伅
* @return
*/
- public static BaseResponse<OrgOrUserAddFailureResponse> delBatchUser(List<UserAddRequest> param){
+ public static BaseResponse<List<UserDelResponse>> delBatchUser(UserDelRequest param){
log.info("銆愭捣搴锋壒閲忔柊澧炰汉鍛樸��================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.delBatchUser(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference< BaseResponse<OrgOrUserAddFailureResponse>>(){};
- BaseResponse<OrgOrUserAddFailureResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ BaseResponse<List<UserDelResponse >> result = JSONObject.parseObject(res, typeReference.getType());
logResult(result,"娴峰悍鎵归噺鏂板浜哄憳");
return result;
}catch (Exception e){
@@ -446,13 +446,13 @@
*璁垮鍏嶇櫥璁伴绾�
* @return
*/
- public static BaseResponse<VisitAppointmentVistorResponse> visitAppiontmentMDJ(VisitAppointmentMDJRequest param){
+ public static BaseResponse<VisitAppointmentMDJResponse> visitAppiontmentMDJ(VisitAppointmentMDJRequest param){
log.info("銆愭捣搴疯瀹㈠厤鐧昏棰勭害銆�================寮�濮�===="+JSONObject.toJSONString(param));
try {
String res = HKTools.visitAppiontmentMDJ(JSONObject.toJSONString(param));
TypeReference typeReference =
- new TypeReference< BaseResponse<VisitAppointmentVistorResponse> >(){};
- BaseResponse<VisitAppointmentVistorResponse> result = JSONObject.parseObject(res, typeReference.getType());
+ new TypeReference< BaseResponse<VisitAppointmentMDJResponse> >(){};
+ BaseResponse<VisitAppointmentMDJResponse> result = JSONObject.parseObject(res, typeReference.getType());
logResult(result,"娴峰悍璁垮鍏嶇櫥璁伴绾�");
return result;
}catch (Exception e){
--
Gitblit v1.9.3