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

huliguo

2 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java

@@ -322,7 +322,7 @@
    private String dyPoiId;

    /**
     * 抖音门店id
     * 快手门店id
     */
    @TableField("ks_poi_id")
    private String ksPoiId;