Commit History

Autor SHA1 Mensaxe Data
  yee af2302db87 Merge branch 'master' of https://git.coding.net/aft/AFT %!s(int64=8) %!d(string=hai) anos
  yee 81322c9ac0 update %!s(int64=8) %!d(string=hai) anos
  albertshaw 20b477653b assets version %!s(int64=8) %!d(string=hai) anos
  albertshaw b3fd69e371 Accept Merge Request #223 合并线上版本到开发版本 : (prod -> master) %!s(int64=8) %!d(string=hai) anos
  wanghui cba0394fe2 Merge remote-tracking branch 'origin/master' into prod %!s(int64=8) %!d(string=hai) anos
  wanghui d33d06902c 修复合并bug %!s(int64=8) %!d(string=hai) anos
  wanghui 1927f1612c Merge remote-tracking branch 'origin/master' into prod %!s(int64=8) %!d(string=hai) anos
  wanghui 7bb33d89a5 修复合并BUG %!s(int64=8) %!d(string=hai) anos
  wanghui e9e1c6e55f Merge remote-tracking branch 'origin/master' into prod %!s(int64=8) %!d(string=hai) anos
  wanghui 8f68b069ff 修复BUG %!s(int64=8) %!d(string=hai) anos
  wanghui ca71b86a7d Merge remote-tracking branch 'origin/master' into prod %!s(int64=8) %!d(string=hai) anos
  wanghui d0ebf35f53 修复BUG %!s(int64=8) %!d(string=hai) anos
  wanghui 7cdd777134 Merge remote-tracking branch 'origin/master' into prod %!s(int64=8) %!d(string=hai) anos
  wanghui e0383a7b64 新闻、成果后台修改 %!s(int64=8) %!d(string=hai) anos
  yee ed039d624d update %!s(int64=8) %!d(string=hai) anos
  yee 0a7276164d update %!s(int64=8) %!d(string=hai) anos
  yee 14b5aabf35 update %!s(int64=8) %!d(string=hai) anos
  yee 7d6f94b7c6 update %!s(int64=8) %!d(string=hai) anos
  albertshaw db91df0dce update %!s(int64=8) %!d(string=hai) anos
  albertshaw 11e103155e update %!s(int64=8) %!d(string=hai) anos
  albertshaw 13ec06eb06 Merge branch 'master' of https://git.coding.net/aft/AFT.git %!s(int64=8) %!d(string=hai) anos
  albertshaw 84b7a1e2d2 update %!s(int64=8) %!d(string=hai) anos
  wanghui 62c86faa4b Merge remote-tracking branch 'origin/master' into prod %!s(int64=8) %!d(string=hai) anos
  wanghui 15535d2575 新闻新增是否军民融合字段 %!s(int64=8) %!d(string=hai) anos
  wanghui 25b0c4186e Merge remote-tracking branch 'origin/master' into prod %!s(int64=8) %!d(string=hai) anos
  wanghui ef16f69307 军民融合 及其他页面优化 %!s(int64=8) %!d(string=hai) anos
  albertshaw 2b11136126 Accept Merge Request #222 合并 : (master -> prod) %!s(int64=8) %!d(string=hai) anos
  yee 0aa4e0d4ad update %!s(int64=8) %!d(string=hai) anos
  albertshaw 7279df5210 update %!s(int64=8) %!d(string=hai) anos
  yee a63036ab86 update %!s(int64=8) %!d(string=hai) anos