Commit Graph

7259 Commits (2dfa7b2f76379efcba34fd7565b069e19eceb36e)
 

Author SHA1 Message Date
廖金灵 2dfa7b2f76 Merge pull request 'release' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/65
张谷成 79872bbaf7 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/64
tping 5775e7f02e 优化
张谷成 83148cd777 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/63
tping 9f329b7c34 优化
廖金灵 919875c69c Merge pull request 'release' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/62
张谷成 5410a1cb2e Merge pull request '时间格式' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/61
tping 98ebb36aa3 时间格式
廖金灵 72589a4b9e Merge pull request '版本更新v1.3.0' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/60
张谷成 049f08af72 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/59
tping e3f020965d 优化
张谷成 5de3b95d54 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/58
tping b4c3b64fb0 优化
张谷成 2123ad9ef4 Merge pull request '优化' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/57
tping e57a5f8e50 优化
张谷成 a97e94fc21 Merge pull request '1' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/56
tping ee34cc86f5 1
郑永星 a6812d26e4 Merge pull request '短信验证万能验证码注释' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/55
zhengyongxing f5e2adb860 短信验证万能验证码注释
郑永星 c62ad6e69d Merge pull request '12.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/54
zhengyongxing 9c0006ef45 12.28功能提交
郑永星 a9aca61c73 Merge pull request '12.28功能提交' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/53
zhengyongxing f855835501 12.28功能提交
郑永星 444cff5f64 Merge pull request '12.28功能提交' () from feature/add_item into release
12.28功能提交
zhengyongxing d1b0ec55a8 12.28功能提交
郑永星 1496fa349a Merge pull request '12.28功能提交' () from feature/add_item into release
12.28功能提交
zhengyongxing 0293fd7ff1 12.28功能提交
zhengyongxing bb73235874 12.28功能提交
郑永星 12434fb840 Merge pull request 'feature/add_item' () from feature/add_item into release
12.28功能提交
zhengyongxing e84ce56293 12.28功能提交
万盟天下 459026d842 Merge pull request '修改bug' () from feature/leniu_testing_resource into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/49
ELF a70bffaee3 修改bug
万盟天下 4917d4806f Merge pull request '调试bug' () from feature/leniu_testing_resource into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/48
ELF 4f4929ad72 修改
万盟天下 9ded6cb0bd Merge pull request '剑仙诀添加资源发放接口' () from feature/leniu_testing_resource into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/47
ELF 932a082134 剑仙诀添加资源发放接口
zhengyongxing 08d235c03a 12.28功能提交
zhengyongxing 3c166a913e Merge branch 'feature/update_payment' into feature/add_item
# Conflicts:
#	Application/Admin/Controller/CompanyStatementOfflineController.class.php
#	Application/Admin/Controller/StatementMangementController.class.php
#	Application/Payment/Controller/PaymentController.class.php
#	Application/Payment/View/Payment/lists.html
#	Data/update.sql
廖金灵 599312e809 Merge pull request '紧急需求12.28' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/45
张谷成 1c1ef2e6a9 Merge pull request 'feature/1228zgc' () from feature/1228zgc into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/46
郑永星 cd2d9b3bc2 Merge pull request '12.28功能提交' () from feature/update_payment into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/44
zhengyongxing e0f17ea195 12.28功能提交
郑永星 11c7c542f8 Merge pull request '12.28功能提交' () from feature/update_payment into release
12.28功能提交
zhengyongxing d0ee96f7b5 12.28功能提交
郑永星 db487f1033 Merge pull request 'feature/update_payment' () from feature/update_payment into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/42
zhengyongxing ac70fd3f79 12.28功能提交
zhengyongxing f4027b75b3 12.28功能提交
zhengyongxing eb8478fbb7 12.28功能提交
郑永星 21f957f46f Merge pull request '12.28功能提交' () from feature/update_payment into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/41
zhengyongxing 08153a8359 12.28功能提交