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

peng

4 天以前 aac2321d1cf5536f7ea03f30d55a4aba30fbf710

 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";