Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

rx

2023-10-26 e0a35f3912912fb3a160ee2633594a2e6c828abc

 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;

/**