Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

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

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

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

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


    public Long getOrderId() {
        return orderId;
    }

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

    public String getUpdateRemark() {
        return updateRemark;
    }