Merge branch 'master-prod-new' into master-test

fhx

2023-11-06 3d863f17545d9f3f5f94ab8f22f7d197d72f448d

 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;