Merge branch 'master-prod-new' into chenjiahe-订单积分

chenjiahe

2023-11-09 d5f27d8192422574047b7c557538c595088284a6

 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;