From e192c9e13596244cbd4e7912331c19bcc92f2e6c Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 18 十二月 2023 14:56:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java | 3 +++
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 9 +++++++--
phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java | 2 +-
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 2 ++
4 files changed, 13 insertions(+), 3 deletions(-)
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 3230c59..f413d24 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
@@ -32,6 +32,8 @@
private String opRoleId;
/** 鍒拌璁㈠崟id */
private String visitOrderId;
+ /** 鏄惁鑽夌*/
+ private Integer isDraft;
private List<MicroPlanDto> planList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
index 58569fb..7e11ae3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
@@ -46,4 +46,7 @@
private Integer isSuc;
/**鏄惁鏌ヨ鎷煎洟 0 鍚� 1 鏄�*/
private Integer isGroupBuy;
+
+ /**鏄惁杩囨护宸查��娆剧殑鍗� 0 鍚� 1 鏄�*/
+ private Integer isRefund;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
index 2442316..ae5268f 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
@@ -1,7 +1,5 @@
package com.hz.his.dto.order;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;
import java.math.BigDecimal;
@@ -41,4 +39,11 @@
/**澶勬柟璁㈠崟id*/
private String prescriptionId;
+ /**鍏宠仈鏍囪瘑绫诲瀷:0鑹捐姱鑽熶笓鍖�*/
+ private Integer relationType;
+ /**鍏宠仈鏍囪瘑*/
+ private String relationId;
+ /**鍏宠仈鍚嶇О*/
+ private String relationName;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
index 15760ea..bd3937d 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
@@ -33,7 +33,7 @@
/**浼氬憳鐘舵��*/
private List<String> userStatusList;
/**澧為暱涓績鏄犲皠椤圭洰*/
- private List<String> upProjectIdList;
+ private List<String> upProjectNameList;
/**椤鹃棶鏍囪瘑*/
private List<String> adviserIdList;
/**鏍囩*/
--
Gitblit v1.8.0