6155 Commits (932a0821344eda28dfd5910b41a4404ee9dde62e)

Author SHA1 Message Date
ELF 932a082134 剑仙诀添加资源发放接口 4 years ago
tping 6e63176176 刷新 4 years ago
tping 1dbc61a602 1 4 years ago
tping 858e929199 甲乙方公司 4 years ago
tping 304c59be10 甲乙方公司 4 years ago
tping 08df25eab3 展示错误 4 years ago
廖金灵 feb46d1954 Merge pull request 'feature/add_item_two' (#33) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
4 years ago
zhengyongxing 87c6c71d0a 汇总bug修改 4 years ago
zhengyongxing 699449a702 未结算数据的补充 4 years ago
zhengyongxing 0c49d1d655 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two 4 years ago
zhengyongxing 32abdbb390 汇总统计修改 4 years ago
chenzhi fc75b7d81d 优化统计 4 years ago
chenzhi 79588d52e8 优化财务汇总 4 years ago
ELF 9f61cdade9 Merge branch 'master' of 8.136.139.249:wmtx/platform into release 4 years ago
郑永星 9d93f9d56f Merge pull request '未结算数据的补充' (#25) from feature/add_item into release
未结算数据的补充
4 years ago
zhengyongxing 77678249bf 未结算数据的补充 4 years ago
郑永星 bbfc5f64b8 Merge pull request 'feature/add_item' (#24) from feature/add_item into release
未结算数据的补充
4 years ago
zhengyongxing 84efc4d76d 未结算数据的补充 4 years ago
郑永星 6699ce1045 Merge pull request '未结算数据的补充' (#23) from feature/add_item into release
未结算数据的补充
4 years ago
zhengyongxing f13ee0583c 未结算数据的补充 4 years ago
廖金灵 ace44195c5 Merge pull request 'hotfix/and_bug' (#22) from hotfix/and_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/22
4 years ago
chenzhi 78451f0551 消除打印信息 4 years ago
chenzhi 96ead18ff6 优化打印 4 years ago
chenzhi 7abcd38f36 解决推广公司bug 4 years ago
廖金灵 3bedf259a0 Merge pull request 'feature/1211' (#21) from feature/1211 into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/21
4 years ago
陈志 7286e3d157 Merge pull request 'hotfix/and_bug' (#20) from hotfix/and_bug into release
优化下游推广公司搜索
4 years ago
chenzhi fb798e82bf 优化下游推广公司搜索 4 years ago
tping e4ef55531a 特殊公司评级管理权限 4 years ago
tping e495105ed0 会长可以看 4 years ago
廖金灵 72135079fa Merge pull request '数据授权js错误修正' (#16) from feature/add_item into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/16
4 years ago
zhengyongxing a31e3bf1ab 数据授权js错误修正 4 years ago
tping 15c841e883 Merge branch 'release' into feature/1211 4 years ago
tping 553ce102df 特殊公司 4 years ago
郑永星 1f75da3603 Merge pull request '手机万能验证码隐藏' (#13) from feature/add_item into release
手机万能验证码隐藏
4 years ago
zhengyongxing 9736a32013 手机万能验证码隐藏 4 years ago
郑永星 bc162ada96 Merge pull request '手机验证码修改账号' (#12) from feature/add_item into release
手机验证码修改账号
4 years ago
zhengyongxing d47b6a3fad 手机验证码修改账号 4 years ago
廖金灵 342b592976 Merge pull request 'feature/testing_resource_verify_admin' (#11) from feature/testing_resource_verify_admin into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/11
4 years ago
郑永星 48bf17afd3 Merge pull request 'feature/add_item' (#10) from feature/add_item into release
短信登录万能验证码登录开启
4 years ago
zhengyongxing 0d9dd3b22e 短信登录万能验证码登录开启 4 years ago
zhengyongxing 11e64947df 12月功能提交 4 years ago
郑永星 ca8a2ada0e Merge pull request '12月功能提交,手机万能验证码屏蔽提交' (#7) from feature/add_item into release
12月功能提交,手机万能验证码屏蔽提交
4 years ago
zhengyongxing 309b195986 12月功能提交 4 years ago
陈志 79ad02ba2e Merge pull request '优化' (#9) from feature/st_mange_20201202 into release
优化
4 years ago
chenzhi 1945cae9a5 优化 4 years ago
张谷成 6e63a3857e Merge pull request 'feature/1211' (#8) from feature/1211 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/8
4 years ago
tping 0fd16f89d8 Merge branch 'release' into feature/1211 4 years ago
zhengyongxing a0150c300f 12月功能提交 4 years ago
tping cf88d4c1db Merge branch 'release' into feature/1211
# Conflicts:
#	Application/Home/Controller/BaseController.class.php
4 years ago
tping 6c266178df 数据互通 4 years ago