From 6436fd1c4ba085e6aea2254071a324269b113ba9 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期四, 03 八月 2023 18:30:34 +0800 Subject: [PATCH] Merge branch 'fhx-prod-用户建档' into master-prod-new --- phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java index fdd9d01..a0a1f97 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java @@ -3,8 +3,10 @@ import com.hz.his.dto.PageDto; import lombok.Data; +import java.util.List; + /** - * Created with IntelliJ IDEA. + * 寮�鍗曞弬鏁癉to * * @Author: zhouxiang * @Date: 2022/08/31/10:32 @@ -12,13 +14,20 @@ */ @Data public class OrderPHisDto extends PageDto { - //type:0:鑽夌 1:鎻愪氦 2:缁撹处,crm濉�2锛屽繀濉� + /**0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处(鐩墠缁撹处鍜屽垱寤烘槸鍒嗗紑鐨�),crm濉�2锛屽繀濉�*/ private String type; - //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鍚庣澶勭悊锛岃幏鍙栧綋鍓嶇櫥褰曚汉鏍囪瘑,crm濉敤鎴凤紝蹇呭~ + /**鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鑾峰彇褰撳墠鐧诲綍浜烘爣璇�,crm濉敤鎴凤紝蹇呭~*/ private String operatorId; - //鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~ + /**鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~*/ private String shopId; - private OrdersTotalDto ordersTotal; - private OrderItemDto orderItem; - private OrderDeveloperDto orderDeveloper; + /**鎬昏鍗曚俊鎭紝蹇呭~*/ + private OrdersPHisTotalDto orderTotal; + /**涓�绾у瓙璁㈠崟锛屽繀濉�*/ + private List<OrderItemPHisDto> orderItem; + /**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/ + private List<OrderDeveloperDto> orderDeveloper; + + /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/ + private Integer cardPass = 0; + } -- Gitblit v1.8.0