#1221: Merge branch 'master' into v5

This commit is contained in:
Anyon 2019-07-18 16:10:51 +08:00
commit 2e8810c8ae
2 changed files with 17 additions and 20 deletions

@ -1 +1 @@
Subproject commit da02feb71955de0ed878b1f65782b85e198063ea
Subproject commit db6fbae1df45215944213b391e878fd311074791

View File

@ -3,24 +3,21 @@ branches: {
}
fileChange:
/application:
newFile: !uuid 'bbc0817dcd5faf478c9eca3d0bd6eb2731a45ff1'
oldFile: !uuid '32e98d694942c97bede40bc79b16f5ae0ce3f578'
/application/wechat:
newFile: !uuid 'd7b94d447ad247524ae9d6400f37012cbc0fbb84'
oldFile: !uuid '2388576432f2a69f9ee04898addc2ffc010b6d08'
/application/wechat/service:
newFile: !uuid '0ab796def95ac0f1c27a4cf32e3a406123db1a6d'
oldFile: !uuid 'e4ba04d5dc2004c94fad4be8d581869cadc09a6f'
/application/wechat/service/FansService.php:
newFile: !uuid '9ae00b0ffe42e5cf30c680ef08943ce362f87819'
oldFile: !uuid '62bc8a844aa7b4cb9791df039883db07f1d1de2c'
/config:
newFile: !uuid '041de27ee14bea29f582dc7a761df8308a7b0b6f'
oldFile: !uuid '1340afdae793fcb72158c30185aac21cb5f17d48'
/config/app.php:
newFile: !uuid 'ad6afc1d0c79970a85a0a17e502f8d04122ae086'
oldFile: !uuid 'b645e93819839fae20452c16e396df2923edeb53'
gitCommitId: !uuid 'da02feb71955de0ed878b1f65782b85e198063ea'
newFile: !uuid '45151f456ad0040a1923dc63b994d383e2a38f8d'
oldFile: !uuid 'bbc0817dcd5faf478c9eca3d0bd6eb2731a45ff1'
/application/admin:
newFile: !uuid '2a34560b8087258d4b080b696642543116e9cb45'
oldFile: !uuid '5334bc8be4a41c0a0d4a4543af892b0f7c913bd5'
/application/admin/controller:
newFile: !uuid '9d9b36ef5fdf7d119636e9b0dd34666f6106b795'
oldFile: !uuid '7b8c656418d3e5b2f32321d801135cd5d0f0d883'
/application/admin/controller/api:
newFile: !uuid '6ab65916ab03ebbd134a8c0bce03c2cb2567e100'
oldFile: !uuid '89e07025b08a587096ebdfacfbf8079fe68c4795'
/application/admin/controller/api/Update.php:
newFile: !uuid '96b9421122091968404abf53e7333ed3a79654cd'
oldFile: !uuid 'c460edbe628bccb248231f0bcb21f8bec2736557'
gitCommitId: !uuid 'db6fbae1df45215944213b391e878fd311074791'
renames: {
}
revisionId: 1220
revisionId: 1221