Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f

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

@@ -31,7 +31,7 @@

    private static final long serialVersionUID = -92724536016243196L;

    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
@@ -93,4 +93,17 @@
    private String merchantName;

    private String paymentMethod;

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