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

fhx

2024-05-10 648eb72de16da108373a2e74b42de25f6c3120a6

 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;

/**