Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2023-11-14 b0fcba348fd912f6416114239d2d9623ad9b89ff

 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;
    /** 结束时间 */