Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

 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;
}