Merge branch 'fhx-prod-复购活动' into master-prod-new

fhx

2024-05-27 2d12c1e7182a0cf34d96536662bb3ca60afe4c0c

 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;

/**