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

lty

7 小时以前 ea62a3548fdc6f451cd464120fc98f1c3cca6f0d

 src/main/webapp/static/layuiadmin/json/message/all.js

@@ -1,46 +1 @@
{
  "code": 0
  ,"msg": ""
  ,"count": 60
  ,"data": [{
    "id": 123
    ,"title": "你好新朋友，感谢使用 layuiAdmin"
    ,"time": 1510363800000
  }, {
    "id": 111
    ,"title": "贤心发来了一段私信"
    ,"time": 1510212370000
  }, {
    "id": 111
    ,"title": "贤心发来了一段私信"
    ,"time": 1510212370000
  }, {
    "id": 111
    ,"title": "贤心发来了一段私信"
    ,"time": 1510212370000
  }, {
    "id": 111
    ,"title": "贤心发来了一段私信"
    ,"time": 1510212370000
  }, {
    "id": 111
    ,"title": "贤心发来了一段私信"
    ,"time": 1510212370000
  }, {
    "id": 111
    ,"title": "贤心发来了一段私信"
    ,"time": 1510212370000
  }, {
    "id": 111
    ,"title": "贤心发来了一段私信"
    ,"time": 1510212370000
  }, {
    "id": 111
    ,"title": "贤心发来了一段私信"
    ,"time": 1510212370000
  }, {
    "id": 111
    ,"title": "贤心发来了一段私信"
    ,"time": 1507447570000
  }]
}
{"code":0,"msg":"","count":60,"data":[{"id":123,"title":"你好新朋友，感谢使用 layuiAdmin","time":1510363800000},{"id":111,"title":"贤心发来了一段私信","time":1510212370000},{"id":111,"title":"贤心发来了一段私信","time":1510212370000},{"id":111,"title":"贤心发来了一段私信","time":1510212370000},{"id":111,"title":"贤心发来了一段私信","time":1510212370000},{"id":111,"title":"贤心发来了一段私信","time":1510212370000},{"id":111,"title":"贤心发来了一段私信","time":1510212370000},{"id":111,"title":"贤心发来了一段私信","time":1510212370000},{"id":111,"title":"贤心发来了一段私信","time":1510212370000},{"id":111,"title":"贤心发来了一段私信","time":1507447570000}]}