From f6adad210793ad1942f469bc9a06b44e0537bdae Mon Sep 17 00:00:00 2001 From: zhouxiang <zhouxiang> Date: 星期一, 05 九月 2022 16:20:16 +0800 Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign --- phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 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 b99a9f7..9e8f49c 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 @@ -14,16 +14,16 @@ */ @Data public class OrderPHisDto extends PageDto { - //type:0:鑽夌 1:鎻愪氦 2:缁撹处,crm濉�2锛屽繀濉� + //type:0:鑽夌 1:鍒涘缓璁㈠崟 2:鍒涘缓璁㈠崟+缁撹处(鐩墠缁撹处鍜屽垱寤烘槸鍒嗗紑鐨�),crm濉�2锛屽繀濉� private String type; - //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鍚庣澶勭悊锛岃幏鍙栧綋鍓嶇櫥褰曚汉鏍囪瘑,crm濉敤鎴凤紝蹇呭~ + //鎿嶄綔浜篿d(褰撳墠鐧诲綍浜虹殑鏍囪瘑),鑾峰彇褰撳墠鐧诲綍浜烘爣璇�,crm濉敤鎴凤紝蹇呭~ private String operatorId; //鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~ private String shopId; //鎬昏鍗曚俊鎭紝蹇呭~ - private OrdersTotalDto orderTotal; + private OrdersPHisTotalDto orderTotal; //涓�绾у瓙璁㈠崟锛屽繀濉� - private List<OrderItemDto> orderItem; - //寮�鍙戜汉闆嗗悎 + private List<OrderItemPHisDto> orderItem; + //寮�鍙戜汉闆嗗悎 闈炲繀濉� private List<OrderDeveloperDto> orderDeveloper; } -- Gitblit v1.8.0