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

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/McsOrder.java

@@ -90,4 +90,20 @@

    private Date createTime;

    private String merchantName;

    private String paymentMethod;

    /**
     * 商家地址
     */
    private String address;
    /**
     * 纬度
     */
    private String lat;
    /**
     * 经度
     */
    private String lon;
}