mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2026-07-17 12:31:09 +08:00
#1152: Merge branch 'master' of https://github.com/zoujingli/ThinkAdmin
# Conflicts: # application/store/service/ExpressService.php # application/store/service/ExtendService.php # application/store/service/GoodsService.php # application/store/service/OrderService.php
This commit is contained in:
Anyon
commit
574b278089
@ -1 +1 @@
|
||||
Subproject commit f95fa00fbb14f31d9f3574c170f3854854a0d908
|
||||
Subproject commit 05b337d6bbd2045de81c530926985c2d2c1704ef
|
||||
293
commit.yml
293
commit.yml
@ -1,290 +1,9 @@
|
||||
!revision
|
||||
branches: {
|
||||
}
|
||||
fileChange:
|
||||
/application:
|
||||
newFile: !uuid '0fda79dc80712d729561c26e7a498636dba5facb'
|
||||
oldFile: !uuid '2959365ae926a52bd7f5f68b1984f4022dd14cd3'
|
||||
/application/admin:
|
||||
newFile: !uuid '7105c375ccaa71a16845a02c84ea6830fc4bf272'
|
||||
oldFile: !uuid '2cb731bca6f020d40fdb33a551115161728f3545'
|
||||
/application/admin/controller:
|
||||
newFile: !uuid 'a3fa5467b8e97ea190b1fbb2a944a8c60629af46'
|
||||
oldFile: !uuid 'ad46d941a3933e5fcb469274fba61a1ec3a22321'
|
||||
/application/admin/controller/Oplog.php:
|
||||
newFile: !uuid '8a9c25086f59163ad4f8f26b0480728411a57a91'
|
||||
oldFile: null
|
||||
/application/admin/controller/api:
|
||||
newFile: !uuid '37ce617ee138046b9776255b9fba2c285bfffeb0'
|
||||
oldFile: !uuid '6e1e28019d2b4cca82a74693ae58876567d89722'
|
||||
/application/admin/controller/api/Update.php:
|
||||
newFile: !uuid '0f33d3b94135035f59be7ed72e1b9ca7234f0852'
|
||||
oldFile: !uuid '7de7557b74b768caa39c3b571bb1037c56193629'
|
||||
/application/admin/queue:
|
||||
newFile: !uuid '726efffc0f29ecd9daac5a1b62ce2665d7c137ee'
|
||||
oldFile: null
|
||||
/application/admin/queue/JobsQueue.php:
|
||||
newFile: !uuid '32ef24016b3566dfe1837edb83c52aacf88aa01d'
|
||||
oldFile: null
|
||||
/application/admin/service:
|
||||
newFile: !uuid 'e3c40ddd4a11589452e1d9e63bcf450b870f5811'
|
||||
oldFile: null
|
||||
/application/admin/service/AuthService.php:
|
||||
newFile: !uuid '24ea7a48e3d0d6e81d81420d084bcbf846aa5484'
|
||||
oldFile: null
|
||||
/application/admin/service/MessageService.php:
|
||||
newFile: !uuid '452e9fa8cd4a9270b858a95c9101a7a6d606bc47'
|
||||
oldFile: null
|
||||
/application/admin/service/OplogService.php:
|
||||
newFile: !uuid 'f03695d058e9d48a0bd0ee76b2729bb1e005a8ea'
|
||||
oldFile: null
|
||||
/application/admin/service/QueueService.php:
|
||||
newFile: !uuid 'ae41eda0476c42c284197c8eef095368648e8cb0'
|
||||
oldFile: null
|
||||
/application/admin/view:
|
||||
newFile: !uuid '5b9c39a4ad4f470abcdd2916fb866265babb37a7'
|
||||
oldFile: !uuid '6ba59ad3d363d57668cae836acf2b0d8aec9ef20'
|
||||
/application/admin/view/oplog:
|
||||
newFile: !uuid '1edfa8e5b3c1b107212e0afadc3b2c795746b5b1'
|
||||
oldFile: null
|
||||
/application/admin/view/oplog/index.html:
|
||||
newFile: !uuid '44bfe0ed4e4698950737c183ca7bc6248d8a12ec'
|
||||
oldFile: null
|
||||
/application/admin/view/oplog/index_search.html:
|
||||
newFile: !uuid '265e3800105a34cb8074c3802192f28b6b3c5aa9'
|
||||
oldFile: null
|
||||
/application/index:
|
||||
newFile: !uuid 'b74d27509c0fee0685b3d3442e019d8fcf81ab9e'
|
||||
oldFile: !uuid 'cf0b28425e5f174d5cb86526ba231c5f235817b8'
|
||||
/application/index/controller:
|
||||
newFile: !uuid '895a7928bcfa49902c7122a5e1a3dff4aa0b2619'
|
||||
oldFile: !uuid 'f916fe99546f10574b89b2037edb76c06d247f35'
|
||||
/application/index/controller/Index.php:
|
||||
newFile: !uuid '7950b95cc3e264258ea7d9343649ecce43d5938e'
|
||||
oldFile: !uuid '85e61ff0b14a42188987dce68ef48b6fd91e1ca5'
|
||||
/application/service:
|
||||
newFile: !uuid '6ce3e1def4fdc87c8130e62674b8db0017556752'
|
||||
oldFile: !uuid 'e2bca5f48521c389396592e05b0b905ce3b8c37c'
|
||||
/application/service/handler:
|
||||
newFile: !uuid 'b5587bbeff3361d284cb3daf62d6d8b634b7ac22'
|
||||
oldFile: null
|
||||
/application/service/handler/PublishHandler.php:
|
||||
newFile: !uuid 'd47c3c7510bd66df68c70f5e1bb63897f878749b'
|
||||
oldFile: null
|
||||
/application/service/handler/ReceiveHandler.php:
|
||||
newFile: !uuid 'dc6bcd6883e12f1467c26033b22c62d9c20a9ebc'
|
||||
oldFile: null
|
||||
/application/service/handler/WechatHandler.php:
|
||||
newFile: !uuid '0b91cf972232d87a07d1438cea670a7013746602'
|
||||
oldFile: null
|
||||
/application/service/service:
|
||||
newFile: !uuid '70a337b5c352df1551c8114fee60a9c59f931585'
|
||||
oldFile: null
|
||||
/application/service/service/BuildService.php:
|
||||
newFile: !uuid '5622856324eb1e95ca3f8cd31ba93e711cb6babd'
|
||||
oldFile: null
|
||||
/application/service/service/WechatService.php:
|
||||
newFile: !uuid '8927b26d6ad74a95fdcb3da5ba650588b737a5ce'
|
||||
oldFile: null
|
||||
/application/store:
|
||||
newFile: !uuid '58b5a98c02359882a8eaee5b8701e3e4eb18778b'
|
||||
oldFile: !uuid 'f32ab810e633bad4f9ad5ff40b0d8fdd6c56a234'
|
||||
/application/store/command:
|
||||
newFile: !uuid 'f6eb88d2d572aea7daf3afb0ca86394537a52f0d'
|
||||
oldFile: !uuid '7408fe4fd1d14502223fd83d195e59123436f8b6'
|
||||
/application/store/command/AutoRun.php:
|
||||
newFile: !uuid 'c71ccf89b698b0b73c210f78e35eea0c772c91b4'
|
||||
oldFile: !uuid '16c97c4379b77f887eb711b880b1141794ad488d'
|
||||
/application/store/controller:
|
||||
newFile: !uuid '7ccd997f825199b06d38e5177992ef87e9151b6c'
|
||||
oldFile: !uuid '755c4acd2baaca5ef5d727bdd171968d16c2a2d4'
|
||||
/application/store/controller/Config.php:
|
||||
newFile: !uuid 'd94bba910c7ae6e945e2851774dd0cd14d5b19cc'
|
||||
oldFile: !uuid '9bc44a18ecef837841619b55d4fa102ac3530de0'
|
||||
/application/store/controller/ExpressCompany.php:
|
||||
newFile: !uuid '0a4eec427b12da9d0b29bf609a0d82569dd49df5'
|
||||
oldFile: !uuid 'f0f8649c5150bd34b6de6585316e6f1026ac2adb'
|
||||
/application/store/controller/ExpressProvince.php:
|
||||
newFile: !uuid '890adaf6bdc514f85af7be23b284efb03688ef9d'
|
||||
oldFile: !uuid 'c3ef0b6b71fd22b065ee66306363fa308a1a70b5'
|
||||
/application/store/controller/ExpressTemplate.php:
|
||||
newFile: !uuid '5b406c1b6dc2670009341c1b038eb31971d0ee6c'
|
||||
oldFile: !uuid '2dc0a003827375a9b6ad1ae80c5d9196cc9b7479'
|
||||
/application/store/controller/Goods.php:
|
||||
newFile: !uuid '879ed894c4288381b5c037e3df0da004b383c17d'
|
||||
oldFile: !uuid 'd243dfb65d74facb8a66a6010a7f176227d3ff53'
|
||||
/application/store/controller/GoodsCate.php:
|
||||
newFile: !uuid '2322f70354da2f9bd19cdf3aed4110fe89016a5c'
|
||||
oldFile: !uuid 'b3149858d2bbbe0fe3267e950c7e6721ade543af'
|
||||
/application/store/controller/Member.php:
|
||||
newFile: !uuid '36daffe13e035aa2c29ad62845af53663712ee0c'
|
||||
oldFile: !uuid 'f92f2f9e855d3e96199085e0ca27b737fcb357e1'
|
||||
/application/store/controller/Message.php:
|
||||
newFile: !uuid '8e0017579208d5793b63ccf94f9d15f6fb71b92f'
|
||||
oldFile: !uuid '16cbaf25b8cdd7d0fad053658989d3b6a2eec822'
|
||||
/application/store/controller/Order.php:
|
||||
newFile: !uuid '5cb96902e20f9a7681c1322e30da33edd3e759b8'
|
||||
oldFile: !uuid 'bb9bf70e3b49df15eb118c82028d7a5cf0ce16c6'
|
||||
/application/store/controller/api:
|
||||
newFile: !uuid '8506fa8a907da2e58354a04de36e162d4a3eab43'
|
||||
oldFile: !uuid '9ca739c497389373714e4f63d5a3c9224c67503f'
|
||||
/application/store/controller/api/Notify.php:
|
||||
newFile: !uuid '5422b474b90ad0b3f873d39c5ce6b55f13dcceed'
|
||||
oldFile: !uuid 'de8a9ca28196d28d0ce071c676c53664ca3a76ca'
|
||||
/application/store/controller/api/member:
|
||||
newFile: !uuid '151b489170000edc46c2bbd9b108c1c61d7585eb'
|
||||
oldFile: !uuid 'b026cf186e49b582bc0dc743a06a3d0326779564'
|
||||
/application/store/controller/api/member/Center.php:
|
||||
newFile: !uuid '1f968ff464bd081ef22db22fe10d78c726b0b015'
|
||||
oldFile: !uuid '5a08e6b394a583ebcf782aeee3e41f4f272520bb'
|
||||
/application/store/controller/api/member/Order.php:
|
||||
newFile: !uuid '6771f85300eb57da5eeed74f9684f86d476f594c'
|
||||
oldFile: !uuid 'b0aba206ef83364a0011412680fe3d281c99d0f3'
|
||||
/application/store/service:
|
||||
newFile: !uuid '4e6ba24929fcd74b50ec59295613e72677b69ea4'
|
||||
oldFile: !uuid 'acfb3e6f7a32c42e4753b6199bcec579448d0d7b'
|
||||
/application/store/service/Express.php:
|
||||
newFile: null
|
||||
oldFile: !uuid '67461467a1549cf9235cb20defd75f610cb10418'
|
||||
/application/store/service/ExpressService.php:
|
||||
newFile: !uuid 'e3b652fbbff7cf749fc3409aa43bdfc702b4a4ec'
|
||||
oldFile: null
|
||||
/application/store/service/Extend.php:
|
||||
newFile: null
|
||||
oldFile: !uuid '3c518cfcac68e95bdf75a6b449423bf7f579cf4f'
|
||||
/application/store/service/ExtendService.php:
|
||||
newFile: !uuid '6d26c3f75ef653387fa1b0a86620ebb93906c688'
|
||||
oldFile: null
|
||||
/application/store/service/Goods.php:
|
||||
newFile: null
|
||||
oldFile: !uuid '06d13b8ac6d352ef727c8346eadbd1fa31d6d102'
|
||||
/application/store/service/GoodsService.php:
|
||||
newFile: !uuid 'b41a1e6d6ae29d4ee3276efe776dd45c8b431260'
|
||||
oldFile: null
|
||||
/application/store/service/Order.php:
|
||||
newFile: null
|
||||
oldFile: !uuid '831986c9784a92782bc3018eaf4c93f87079bb86'
|
||||
/application/store/service/OrderService.php:
|
||||
newFile: !uuid 'acd952587ad3c5f4914172320f137cdc5c2a8ec2'
|
||||
oldFile: null
|
||||
/application/store/view:
|
||||
newFile: !uuid '7a83303af69269fbbdcdc928a721440cefd55f64'
|
||||
oldFile: !uuid 'ccfefb352afe0e530885378a2214020eed2f5ecd'
|
||||
/application/store/view/config:
|
||||
newFile: !uuid '35fcbbda361a9313fc0828aa7ae4b73150583513'
|
||||
oldFile: !uuid 'c3c5e709a66d715d3e416979bb5062bb95f92844'
|
||||
/application/store/view/config/index.html:
|
||||
newFile: !uuid '4fe5b334a5766436988b513f64a5b9ee22fab2cc'
|
||||
oldFile: !uuid '64b0a8a0c2b9ceb0b1e1bf6289bcf8a31442523c'
|
||||
/application/store/view/config/sms.html:
|
||||
newFile: !uuid 'f381cf81f7406a076272dcfe47c4d36270c32c4b'
|
||||
oldFile: null
|
||||
/application/store/view/express_company:
|
||||
newFile: !uuid 'ddd7d397ddc3595ad807d520a7e9cf2b639d700b'
|
||||
oldFile: !uuid '7e9b3779f943f48006d798b85a234c42356b802d'
|
||||
/application/store/view/express_company/index.html:
|
||||
newFile: !uuid 'ca27a92fab0fcd395ab2ac2d39d3c728c635ad7b'
|
||||
oldFile: !uuid '8b0e015bea657b77f8050eb43b6c4592940324d6'
|
||||
/application/store/view/express_province:
|
||||
newFile: !uuid '7f9db6582d1a4965bb471483cdcd3ba0e33fc592'
|
||||
oldFile: !uuid '64198615c0f4f7b8572f29e1fea6ecb77535afdf'
|
||||
/application/store/view/express_province/index.html:
|
||||
newFile: !uuid '11a2dbfbb7b27e2dd8a177d8296e2aa7cf4bfd44'
|
||||
oldFile: !uuid 'e411a62a2757cc5bd2922f2d0fe91dc783ce2cd5'
|
||||
/application/store/view/express_template:
|
||||
newFile: !uuid '189941cd0aff38d5087d6aceaf20fab43d29064e'
|
||||
oldFile: !uuid '11b6c563e8b591b0b59a2a5aab913d8abd96c27d'
|
||||
/application/store/view/express_template/index.html:
|
||||
newFile: !uuid 'b01b9c8ae7873123d749d9af7b2f2a3b2952e119'
|
||||
oldFile: !uuid '8dab31626694ea68d408421d88e13e40f3e6d222'
|
||||
/application/store/view/goods:
|
||||
newFile: !uuid '87037507e8d58169c56267a897d3590f89ee877c'
|
||||
oldFile: !uuid 'ece99ae5143270a2875307261594faea198b2027'
|
||||
/application/store/view/goods/form.html:
|
||||
newFile: !uuid '9660500097371cd9ae28c9606c24eb18d7cddd7d'
|
||||
oldFile: !uuid 'cb94436da8bfed0928b0f4ece761c8d63d36dba8'
|
||||
/application/store/view/goods/form_style.html:
|
||||
newFile: !uuid '72191fe915b83d8083419776b7cdc0991bd9f6a5'
|
||||
oldFile: null
|
||||
/application/store/view/goods/index.html:
|
||||
newFile: !uuid 'cafbc532820f6ac0567e89cb6f74eed1dda4d665'
|
||||
oldFile: !uuid 'd62725393425c7b65b283d12a2022bd9c62a0596'
|
||||
/application/store/view/goods/index_search.html:
|
||||
newFile: !uuid 'd7f8fbb732fe21cb866b25eb8e8ee789bf2b18a8'
|
||||
oldFile: !uuid '7f3f65bc346abe1e0e35f9081149a13bbf02b2e7'
|
||||
/application/store/view/goods_cate:
|
||||
newFile: !uuid '07ff4af86f1d3d1255ca727d1cce27d095a58f75'
|
||||
oldFile: !uuid '52c87d0d95b4e9d2569767a9229ed17f96b2d73e'
|
||||
/application/store/view/goods_cate/form.html:
|
||||
newFile: !uuid 'e836eabb7fda427cdd9c15c02d6b962e26709282'
|
||||
oldFile: !uuid '67982a866ec0eb902369ff1ea824cf959499663c'
|
||||
/application/store/view/goods_cate/index.html:
|
||||
newFile: !uuid '8090d24543c904de2a89fb59671ed616e883dc7f'
|
||||
oldFile: !uuid '39808469de07f38556b0b9bf532b36f6781025bb'
|
||||
/application/store/view/goods_cate/index_search.html:
|
||||
newFile: !uuid 'f5cd9d299b7ef552c2589191f89432700da16927'
|
||||
oldFile: !uuid 'a45e23abdaecc6e3fc763afefc8abc336adf1a92'
|
||||
/application/store/view/member:
|
||||
newFile: !uuid 'b669cc0341eb7a6201f897ea958979819981cd85'
|
||||
oldFile: !uuid 'eb1ed9b36e956d67b41c8eac73a6056c7a5822e8'
|
||||
/application/store/view/member/index.html:
|
||||
newFile: !uuid '7fd6b1f4434399bd192c4d4991615fd413695bcd'
|
||||
oldFile: !uuid '2f2cfe8dfa9260af0d46705fadddbd24be76d3fb'
|
||||
/application/store/view/message:
|
||||
newFile: !uuid 'ef70809c16a149f182ec989e5276baa59fac14e1'
|
||||
oldFile: !uuid 'fb99c09b35d72a0b216c557431f2e61002c00ac5'
|
||||
/application/store/view/message/index.html:
|
||||
newFile: !uuid '1151894ed2922db09d67f79f0c276c24198c864b'
|
||||
oldFile: !uuid '0590e87d3444f99f2cea8a0bbab9e0cc24b114a7'
|
||||
/application/store/view/order:
|
||||
newFile: !uuid '3664d3c5126b3aa4d6498f7e2c11888457e502d7'
|
||||
oldFile: !uuid '6b2a0cd8b63c3a0c8ea37c06cd28745d6c8db3c8'
|
||||
/application/store/view/order/index.html:
|
||||
newFile: !uuid '11407e1b60b5663d4de6f7acb0427bd01fe36ec7'
|
||||
oldFile: !uuid '75fd04af453cebdd4f0dc20502d67ff52453bfb1'
|
||||
/application/store/view/order/index_search.html:
|
||||
newFile: !uuid 'b8f943347f3a32e3f4c3ff5a89102d5eb66e06ac'
|
||||
oldFile: !uuid '9b4f1733a4faeb4caec9f732f48221f3d5d08852'
|
||||
/application/wechat:
|
||||
newFile: !uuid 'fc931dcb8a356ecaa666c447a636bbe143653215'
|
||||
oldFile: !uuid '1731e77488a00d8972f26ad9622175b2c65f0a07'
|
||||
/application/wechat/queue:
|
||||
newFile: !uuid 'aa2dfa5668781b9ee657057be544edf4d90e3cf2'
|
||||
oldFile: null
|
||||
/application/wechat/queue/WechatQueue.php:
|
||||
newFile: !uuid 'e82635ae9d542ccf3af2bdaf841f6b07a208b96d'
|
||||
oldFile: null
|
||||
/application/wechat/service:
|
||||
newFile: !uuid '5c35e6f8132a6c6457e264f9c3b861a2cfa53d72'
|
||||
oldFile: null
|
||||
/application/wechat/service/FansService.php:
|
||||
newFile: !uuid 'a92562c1b97b894e437f896487d2b08a6226003b'
|
||||
oldFile: null
|
||||
/application/wechat/service/MediaService.php:
|
||||
newFile: !uuid '1d98df7cfe4d0b91710a1e24cedc27180930834c'
|
||||
oldFile: null
|
||||
/application/wechat/service/WechatService.php:
|
||||
newFile: !uuid 'e96b64bc1cdf3e4b451575101a8afb2da105d634'
|
||||
oldFile: null
|
||||
/vendor:
|
||||
newFile: !uuid '0e8954025bdd243dc7bce1d9f84c934852d34c56'
|
||||
oldFile: !uuid '9490917fb65a3c785cf27a617ce6b5dac67ce069'
|
||||
/vendor/autoload.php:
|
||||
newFile: !uuid 'cbe08efa3013f2339c550e6893ac58326c0badcc'
|
||||
oldFile: !uuid '2fd7d13d54b3c8d8ca8862d49197170808c68484'
|
||||
/vendor/composer:
|
||||
newFile: !uuid '334c0d7b1a3866a85a483a8fea6ad5fa8f107f84'
|
||||
oldFile: !uuid '4d51a936f27608d5bd8c4eee4d502f83523e674c'
|
||||
/vendor/composer/autoload_real.php:
|
||||
newFile: !uuid '281dbe5ab16871de5c4a81c2e72b42937a17f9c0'
|
||||
oldFile: !uuid '923cbb6f71c8685987145b2671f76430f7fcb021'
|
||||
/vendor/composer/autoload_static.php:
|
||||
newFile: !uuid '5f8ce133326d2a55ddab4bc53f98c4a00b3dd4c9'
|
||||
oldFile: !uuid 'fcc882debb28c73425b8a8a9c7d88d6c3eb4d35e'
|
||||
gitCommitId: !uuid 'f95fa00fbb14f31d9f3574c170f3854854a0d908'
|
||||
renames:
|
||||
/application/store/service/ExpressService.php: /application/store/service/Express.php
|
||||
/application/store/service/ExtendService.php: /application/store/service/Extend.php
|
||||
/application/store/service/GoodsService.php: /application/store/service/Goods.php
|
||||
/application/store/service/OrderService.php: /application/store/service/Order.php
|
||||
revisionId: 1151
|
||||
fileChange: {
|
||||
}
|
||||
gitCommitId: !uuid '05b337d6bbd2045de81c530926985c2d2c1704ef'
|
||||
renames: {
|
||||
}
|
||||
revisionId: 1152
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user