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

zxl

5 天以前 1c7c1366a88bcb056a0e0bc5e0e2dfe8470b4be2

 framework/src/main/java/cn/lili/elasticsearch/EsSuffix.java

@@ -14,6 +14,11 @@
    public static final String GOODS_INDEX_NAME = "goods";

    /**
     * 视频索引后缀
     */
    public static final String VIDEO_INDEX_NAME = "video";

    /**
     * 日志索引后缀
     */
    public static final String LOGS_INDEX_NAME = "logs";