From 2e46f1aeebcc7eead18e3c0359518cf7ef402147 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期四, 22 二月 2024 16:19:58 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 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 3c0120d..c5bb717 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 @@ -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; @@ -105,4 +107,10 @@ private String addWay; /**鏄惁鎷煎洟 0 鍚� 1 鏄�*/ private Integer isGroupBuy; + + /**娲诲姩椤甸潰绫诲瀷锛�0榛樿鏍囧噯锛夛紝濡傛灉闇�瑕佺壒闇�澶勭悊锛屽~鍐欒繖涓紝榛樿0*/ + private Integer activityPageType = 0; + /**娲诲姩鍖哄垎缂栧彿-鐢ㄤ簬涓�娆℃�ф椿鍔紝瀛樺偍娲诲姩缂栧彿锛屼究浜庢煡鎵�*/ + private String activityPageCode; + } -- Gitblit v1.8.0