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

lty

7 小时以前 ea62a3548fdc6f451cd464120fc98f1c3cca6f0d

 src/main/webapp/static/layuiadmin/json/content/tags.js

@@ -1,21 +1 @@
{
  "code": 0
  ,"msg": ""
  ,"count": "100"
  ,"data": [{
    "id": "001"
    ,"tags": "美食"
  },{
    "id": "002"
    ,"tags": "新闻"  
  },{
    "id": "003"
    ,"tags": "八卦"
  },{
    "id": "004"
    ,"tags": "体育"  
  },{
    "id": "005"
    ,"tags": "音乐"
  }]
}
{"code":0,"msg":"","count":"100","data":[{"id":"001","tags":"美食"},{"id":"002","tags":"新闻"},{"id":"003","tags":"八卦"},{"id":"004","tags":"体育"},{"id":"005","tags":"音乐"}]}