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

chenjiahe

2023-12-26 6ea2d8166b37cf721b54bfc16dfa844f66e94ad9

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

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

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

import com.hz.his.dto.PageDto;
import com.hz.his.vo.order.DeliveryAddressVo;
import lombok.Data;

import java.util.List;
@@ -26,6 +27,8 @@
    private List<OrderItemPHisDto> orderItem;
    /**开发人集合 非必填*/
    private List<OrderDeveloperDto> orderDeveloper;
    /**收货地址*/
    private DeliveryAddressVo deliveryAddress;

    /**卡扣不判断过期时间：0否1是*/
    private Integer cardPass = 0;

 phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java

@@ -10,6 +10,10 @@
 * */
@Data
public class UserReportDto {
    /**操作人*/
    private String operatorId;
    private String operatorName;

    /**过滤测试账号*/
    private Integer isFilterTestAccount;
    /**员工标识*/

 phis-feign/src/main/java/com/hz/his/vo/order/DeliveryAddressVo.java

New file
@@ -0,0 +1,25 @@
package com.hz.his.vo.order;

import lombok.Data;

/**
 * @author CJH
 */
@Data
public class DeliveryAddressVo {

    /**收件-联系人*/
    private String linkMan;
    /**收件-联系电话*/
    private String linkTel;
    /**收件-地址-省*/
    private String province;
    /**收件-地址-市*/
    private String city;
    /**收件-地址-区*/
    private String area;
    /**收件-地址-街道*/
    private String street;
    /**收件-地址-详细*/
    private String addrDetail;
}