Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java

@@ -63,6 +63,12 @@
    private Long orderItemId;

    /**
     * 订单id
     */
    @Extend
    private Long orderId;

    /**
     * 单次扣减金额（理解为单次手工业绩）
     * =订单金额/订单数量
     * 如果是赠送则等于产品原价，业绩记录为赠销
@@ -137,6 +143,26 @@
    @Extend
    private String updateRemark;

    /**
     * 套餐/项目剩余次数
     */
    private Integer remainCount;

    public Integer getRemainCount() {
        return remainCount;
    }

    public void setRemainCount(Integer remainCount) {
        this.remainCount = remainCount;
    }

    public Long getOrderId() {
        return orderId;
    }

    public void setOrderId(Long orderId) {
        this.orderId = orderId;
    }

    public String getUpdateRemark() {
        return updateRemark;