From 596fbb32e2a26579b66818e33ed472d74c1c070a Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期五, 02 十二月 2022 10:37:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/marketing/MarketingDto.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketingDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketingDto.java
index 2248508..d3492a8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketingDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketingDto.java
@@ -1,8 +1,5 @@
 package com.hz.his.dto.marketing;
 
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
-import com.hx.common.annotations.MysqlHexAes;
 import lombok.Data;
 
 /**

--
Gitblit v1.8.0