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

Andru

2023-12-14 9cf18114db306c5adc3f1e9ef8de27aa98db1d52

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

* master-prod-new:
  添加参数
  字段
  增加参数

 phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java

@@ -32,6 +32,8 @@
    private String opRoleId;
    /** 到访订单id */
    private String visitOrderId;
    /** 是否草稿*/
    private Integer isDraft;

    private List<MicroPlanDto> planList;
}

 phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java

@@ -1,7 +1,5 @@
package com.hz.his.dto.order;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.math.BigDecimal;
@@ -41,4 +39,11 @@
    /**处方订单id*/
    private String prescriptionId;

    /**关联标识类型:0艾芯荟专区*/
    private Integer relationType;
    /**关联标识*/
    private String relationId;
    /**关联名称*/
    private String relationName;

}