Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

wangrenhuang

2023-11-06 585c2e68385ef89befae09d78ca34d3fd9166694

 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;