From 5621d5395b5769dc684d60732c9a7465ca0e5b0e Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期五, 23 二月 2024 14:45:32 +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, 2 insertions(+), 3 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 c5bb717..3594f19 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,7 +1,5 @@ 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; @@ -112,5 +110,6 @@ private Integer activityPageType = 0; /**娲诲姩鍖哄垎缂栧彿-鐢ㄤ簬涓�娆℃�ф椿鍔紝瀛樺偍娲诲姩缂栧彿锛屼究浜庢煡鎵�*/ private String activityPageCode; - + /**娲诲姩鍖哄垎鏍囬*/ + private String activityPageName; } -- Gitblit v1.8.0