Commit Graph

8285 Commits (989343b64ffb13b3432a9098615ea80deac59495)
 

Author SHA1 Message Date
廖金灵 642bcefd59 Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/375
廖金灵 cf9ee749ca Merge pull request '优化' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/374
ELF 53bf6bca07 优化
廖金灵 1cc9df9c02 Merge pull request '优化' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/373
ELF b65a62b6ab 优化
ELF b8de662556 优化
廖金灵 175cfbf71c Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/372
廖金灵 44e17b0371 Merge pull request '有害' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/371
ELF 9f37c6db3c 有害
ELF fb12b1345e 有害
ELF 4abcad9106 有害
廖金灵 81540994c5 Merge pull request '有害' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/370
ELF b495135215 有害
廖金灵 58b8918e18 Merge pull request '有害' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/369
ELF 23feb76e09 有害
廖金灵 c01e4c0e90 Merge pull request 'hotfix/remove_promote_package' () from hotfix/remove_promote_package into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/368
ELF b9092a4501 有害
ELF b4c1c68c42 优化
廖金灵 fe06354e16 Merge pull request 'feature/more_payment' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/367
chenzhi c36ce00b60 Merge branch 'master' of 8.136.139.249:wmtx/platform into feature/more_payment
chenzhi c4849ffc7c 新增商户固定
廖金灵 c862c021ae Merge pull request '优化' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/366
ELF ac79ab9589 Merge branch 'master' into release
ELF 80e02733e7 封禁推广员推广链接
廖金灵 08bfa31433 Merge pull request '封禁推广员推广链接' () from hotfix/remove_promote_package into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/364
廖金灵 f568c40e22 Merge pull request '金额错误bug修改' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/363
zhengyongxing b1c82bfd69 金额错误bug修改
zhengyongxing b58bdab705 金额错误bug修改
廖金灵 9e44ad5fe3 Merge pull request '5.27新功能时间修改' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/362
zhengyongxing a4bf7ff108 5.27新功能时间修改
廖金灵 cd33286900 Merge pull request '优化导出错误' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/361
chenzhi ad49a9a419 优化导出错误
廖金灵 f5e42522bf Merge pull request 'feature/more_payment' () from feature/more_payment into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/359
陈志 0d2f58c871 Merge pull request 'feature/more_payment' () from feature/more_payment into release
优化批量导出
chenzhi f211fe6fa7 优化批量导出
廖金灵 bba10a23b1 Merge pull request '5.27新功能上线' () from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/358
zhengyongxing 8abf4e4eb8 5.27新功能上线
chenzhi 3b725f9c1d 新增汇总查看
chenzhi db0d49fe4b 优化合并查看
廖金灵 f556d7889e Merge pull request '修改' () from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/357
chenzhi cb81eaf8cc 优化模板为9px
张谷成 01afefe886 Merge pull request '1' () from feature/company0521 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/356
tping 23d79c5f2c 1
郑永星 6b10bc1b05 Merge pull request '5.26功能上线' () from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/355
zhengyongxing 0c5dfdebf9 5.26功能上线
廖金灵 49cf32ebf0 Merge pull request 'hotfix/change_pay_0526' () from hotfix/change_pay_0526 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/354
chenzhi 8691edb6b4 优化导出模板
chenzhi e95087060a 优化上游逻辑
chenzhi 6df1f871f2 优化设置后的其他比例问题
陈志 a0c9d6e7a9 Merge pull request 'hotfix/change_pay_0526' () from hotfix/change_pay_0526 into release
优化名称