From a4c539d27c6e7f5268bb0a71df935e3cdfcf3a29 Mon Sep 17 00:00:00 2001 From: ANDRU-PC\Andru <769883346@qq.com> Date: 星期一, 06 三月 2023 11:47:06 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java index 53ec72a..2442316 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java @@ -1,5 +1,7 @@ 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; @@ -31,4 +33,12 @@ private BigDecimal discount; /** 鍒掓墸鐜伴噾鎬婚噾棰�(浣滅敤:鐢ㄦ潵璁$畻鍒掓墸椤圭洰鐨勬墽琛岄噾棰�,鏀粯鏂瑰紡鏄幇閲戞敮浠樼殑鎬婚噾棰�) */ private BigDecimal snapPayTotal=BigDecimal.ZERO; + + /**鏄惁纭璁㈠崟*/ + private Integer isCustomerConfirm; + /**澶勬柟璁㈠崟鍙�*/ + private String prescriptionNo; + /**澶勬柟璁㈠崟id*/ + private String prescriptionId; + } -- Gitblit v1.8.0