Merge branch 'master-fwq-爆款活动2.0' into master-test

fwq

2024-06-07 5bb9492f10f08c8f2ab5485d25ae9e2bbf3a3849

 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;

/**