Merge branch 'test' into 'test_screen'

罗元桥

2021-06-22 c6512655e722d9ca80dd8c34b79f6d3923ecf86c

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

@@ -67,7 +67,7 @@
    private Long receiverId;

    /**
     * 删除状态(1.未删除 2.已删除)
     * 是否已删除（1.是  2.否）
     */
    private Integer deleteStatus;

@@ -139,6 +139,11 @@
    private Date updateAt;

    /**
     * 收货时间
     */
    private Date receivingTime;

    /**
     * 订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)
     */
    public interface status{