Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopFlowerOrderPayDO.java

@@ -88,7 +88,7 @@
    /**
     * 原始订单id
     */
    private String orderId;
    private Long orderId;
    /**
     * 退款订单号
     */
@@ -96,11 +96,11 @@
    /**
     * 退款状态(1.处理中 2.退款成功 3.退款失败 4.已取消 5.退款中)
     */
    private String refundStatus;
    private Integer refundStatus;
    /**
     * 类型（1.支付 2.退款 3.取消）
     */
    private String payType;
    private Integer payType;

    /**
     * 支付状态(1.未支付 2.已支付)