From e8bba077c22ca0507b21d463dc9ec2ac922835de Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 22 十一月 2023 17:22:00 +0800
Subject: [PATCH] Merge branch 'rx-1116-营销生日券' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 d0e9b91..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
@@ -1,7 +1,5 @@
package com.hz.his.dto.micro;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -17,6 +15,8 @@
/** 鐢ㄦ埛id */
private String userId;
+ /** 缇庨檯鐨偆鎶ュ憡鏍囪瘑 */
+ private String mjSkinReportId;
/** 寮�濮嬫椂闂� */
private String startTime;
/** 缁撴潫鏃堕棿 */
@@ -30,6 +30,8 @@
private String platformType;
/** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */
private String opRoleId;
+ /** 鍒拌璁㈠崟id */
+ private String visitOrderId;
private List<MicroPlanDto> planList;
}
--
Gitblit v1.8.0