Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-05 d769a8683ea6f2ecbc451da71ca3079c6765a99d

 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;