Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservice...

zhaoxiaohao

2020-09-24 6fd4bdff55620c562e0a22eee3c95924951b04a4

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java

@@ -53,6 +53,10 @@
     */
    private String businessId;
    /**
     * 调用方诊断id
     */
    private String diaId;
    /**
     * 记录类型
     * 1：预扣费
     * 2：退预扣费（需要关联预扣费编号）