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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 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;