From 2dd671e816b8a840a5981713effc72977e2795aa Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期二, 14 十一月 2023 18:33:38 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 15 ++++++++-------
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 2 ++
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
index b8624b8..c6a166e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
@@ -12,14 +12,15 @@
/******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
- /**瀹℃牳绫诲瀷 >1000鐨勫�� (鍙傝�僲_application_subject) -蹇呭～椤�*/
- private Integer type;
- /**瀹℃牳绫诲瀷鍞竴瀛楃涓� -蹇呭～椤�*/
- private String typeStr;
- /**瀹℃牳鏍囬 -蹇呭～椤�*/
- private String title;
+
/**瀹℃牳鍞竴鏍囪瘑 -蹇呭～椤�*/
private String uniqueId;
+ /**瀹℃牳鏍囬 -蹇呭～椤�*/
+ private String title;
+ /**瀹℃牳绫诲瀷 >1000鐨勫�� (鍙傝�僲_application_subject,涓嶅彲閲嶅) -蹇呭～椤�*/
+ private Integer type;
+ /**瀹℃牳绫诲瀷鍞竴瀛楃涓�*/
+ private String typeStr;
/**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭～椤�*/
private MarketingContentDto marketingContentDto;
@@ -27,7 +28,7 @@
/**娑堟伅鍙戦�佸唴瀹� -蹇呭～椤�*/
private MarketingMsgDto marketingMsgDto;
- /**鍥炶皟閾炬帴 -蹇呭～椤� 鍥炶皟浼犲弬*/
+ /**鍥炶皟閾炬帴 -蹇呭～椤� 鍥炶皟鍙傛暟鍙傝�僊arCommonReturnDto*/
private String callbackUrl;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
index 9e6e75f..3230c59 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
@@ -30,6 +30,8 @@
private String platformType;
/** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
private String opRoleId;
+ /** 鍒拌璁㈠崟id */
+ private String visitOrderId;
private List<MicroPlanDto> planList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 8a4b5e2..837a5dd 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
@@ -134,4 +135,9 @@
@PostMapping(value = "/user/room/doctor/diagnosis/create")
Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+ /**
+ * 寮�鏀惧钩鍙�-杞彂鍒涘缓钀ラ攢鍔╂墜瀹℃牳
+ */
+ @PostMapping(value = "/user/common/approve/create")
+ Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
}
\ No newline at end of file
--
Gitblit v1.8.0