Merge branch 'developer' into alpha

Helius

2022-03-14 938d37e96dc00f8fc3c7036d818e87d51624e0a9

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

@@ -143,6 +143,18 @@
    @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;