#1222: Merge branch 'master' into v5

This commit is contained in:
Anyon 2019-07-18 16:49:26 +08:00
commit 0b68b77466
2 changed files with 44 additions and 17 deletions

@ -1 +1 @@
Subproject commit db6fbae1df45215944213b391e878fd311074791
Subproject commit 9378e56a7f36d61bf99a184bf561180d88472be8

View File

@ -3,21 +3,48 @@ branches: {
}
fileChange:
/application:
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'
newFile: !uuid '2acb28fc3b534b6b649cdf055f9f1cd1b369cc60'
oldFile: !uuid '45151f456ad0040a1923dc63b994d383e2a38f8d'
/application/store:
newFile: !uuid '38d2d24b283f4a1157fb88e930f47bbb3b465bc7'
oldFile: !uuid 'b7102ef84c20fdaffd27ca5b8f08101127353994'
/application/store/controller:
newFile: !uuid '7ed672c78f542123b7eb9ae008ea0d000f8114fa'
oldFile: !uuid '19fa1441d5e420258a0b8030e8597a8722641060'
/application/store/controller/Message.php:
newFile: !uuid 'edc4ee0a7e58380645d41f4909101ca92b81bdba'
oldFile: !uuid '3fdc570188671e1e8e77a23d7d9c123a3970a91d'
/application/store/controller/Order.php:
newFile: !uuid '0296b669fad4a0cb7ca85be0bae80c72151cf982'
oldFile: !uuid 'c3c919f14f71022592a410cc00f5a637e1dfe476'
/application/store/view:
newFile: !uuid 'fd164c42b1674746a25c8892f658ad6fdaecc29f'
oldFile: !uuid 'cbc3a60c5904d400bb251af8c132d92fcb808a2a'
/application/store/view/config:
newFile: !uuid 'b2d96052d6a64b07fc733df406505eceb8d56d5d'
oldFile: !uuid '428e956da9f8976a35f4a7b65179c5cce7dc2fc4'
/application/store/view/config/index-store-message1.html:
newFile: !uuid 'd00eba8e26da0547a7511d6baebe0e7aba1246a9'
oldFile: !uuid 'fac167d3c329a1d75241df546999ca5f94c69a7f'
/application/store/view/config/index-store-message2.html:
newFile: !uuid '6c05a427b615a5a25a590874150aa8bf1b942511'
oldFile: !uuid '0d689c04c8d7474dc9d92f24b487408b103e4abf'
/application/wechat:
newFile: !uuid '10e44be20d65c399b0898380816b3e9ca62eb088'
oldFile: !uuid 'd7b94d447ad247524ae9d6400f37012cbc0fbb84'
/application/wechat/service:
newFile: !uuid 'fc58404335355781d53e75c660f67ffbd36fb7f4'
oldFile: !uuid '0ab796def95ac0f1c27a4cf32e3a406123db1a6d'
/application/wechat/service/MediaService.php:
newFile: !uuid '67b4cf03485d97e394e2924b99fa68d615af5871'
oldFile: !uuid '82a99396ec020d9c8e2d62db71ba1246fcc5f2b0'
/config:
newFile: !uuid 'ec1454e56c468988422048326859935aff7a9320'
oldFile: !uuid '041de27ee14bea29f582dc7a761df8308a7b0b6f'
/config/app.php:
newFile: !uuid '2295707abca56cebf693fad2c5f65190398c1106'
oldFile: !uuid 'ad6afc1d0c79970a85a0a17e502f8d04122ae086'
gitCommitId: !uuid '9378e56a7f36d61bf99a184bf561180d88472be8'
renames: {
}
revisionId: 1221
revisionId: 1222