From 75657341cbec7db1a6c258228654109f5f569e00 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 24 五月 2023 10:48:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new-优惠券校验' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index ee862c8..9234d13 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -14,6 +14,9 @@
  */
 @Data
 public class OrdersPHisTotalDto {
+
+    /**蹇呭~ 璁㈠崟鍒嗙被锛圤rderTotalConstants锛�,榛樿鏍囧噯璁㈠崟*/
+    private Integer orderClassify;
     /**蹇呭~ 璁㈠崟绫诲瀷锛圤rderTotalConstants锛�,,crm濉粯璁roject,鍏呭�煎氨濉玶echarge,绾晢鍝佽鍗曞~retail闆跺敭*/
     private String type;
 
@@ -54,7 +57,7 @@
     /**闈炲繀濉� 璁㈠崟鎺ㄨ崘浜哄悕绉�(鍐椾綑),涓夊皯璇达細crm蹇呭~ 涓嶄紶,鍚庡彴澶勭悊*/
     private String inviteeName;
 
-    /**蹇呭~ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭~1锛屽惁鍒�0(涓嶄紶,鍚庡彴绾夸笂榛樿鍚屾,娴嬭瘯鐜榛樿涓嶅悓姝�)*/
+    /**蹇呭~ 鍚屾鐘舵��0鍚�1鏄� ,濡傛灉瑕佸悓姝ュ埌棰嗗缓蹇呭~1锛屽惁鍒�0*/
     private int hisSynStatus;
 
     /**蹇呭~ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */

--
Gitblit v1.8.0