Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java

@@ -105,4 +105,9 @@
     * 状态，1启用，0停用
     */
    private Boolean enabled;

    /**
     * 使用状态
     */
    private String useType;
}