Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponTypeDto.java

@@ -11,4 +11,6 @@
public class CouponTypeDto extends PageDto {
    /**是否营销助手可申请*/
    private Integer isMarketAssistantApply;
    /** 优惠券成本部门 */
    private String costDeptName;
}