Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test

rx

2024-07-12 6a9d4b49c03781bbb49a41f1d16e510baa2881aa

 phis-feign/src/main/java/com/hz/phis/dt/limit/LimitTotalDt.java

@@ -46,7 +46,10 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date lastEndTime;

    /**是否可用增值金结账*/
    private Integer useIncrement;
    /**是否可用优惠券结账*/
    private Integer useCoupon;
    /**类型-卡项*/
    public static final Integer LIMIT_CARD_ITEM = 0;
    /**类型-促销*/