Merge remote-tracking branch 'origin/master-base' into master-prod-new

rx

2024-08-05 d621324bcf6c5a26f058b24e0f4d2930f41840f4

 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;

/**