From b0fcba348fd912f6416114239d2d9623ad9b89ff Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 14 十一月 2023 15:41:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java | 4 ++--
1 files changed, 2 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..9e6e75f 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;
/** 缁撴潫鏃堕棿 */
--
Gitblit v1.8.0