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 |
|
廖金灵
|
bc52f043c6
|
Merge pull request '优化下游推广公司搜索' (#19) from hotfix/and_bug into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/19
|
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 |
张谷成
|
02535c1a4b
|
Merge pull request '特殊公司评级管理权限' (#18) from feature/1211 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/18
|
4 years ago |
tping
|
e4ef55531a
|
特殊公司评级管理权限
|
4 years ago |
|
张谷成
|
1c804563e6
|
Merge pull request '会长可以看' (#17) from feature/1211 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/17
|
4 years ago |
|
tping
|
e495105ed0
|
会长可以看
|
4 years ago |
|
chenzhi
|
fe75b57618
|
合并master
|
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 |
|
chenzhi
|
0d533525fe
|
优化权限修改
|
4 years ago |
|
廖金灵
|
85e33e7089
|
Merge pull request '版本更新v1.2.0' (#15) from release into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/15
|
4 years ago |
|
张谷成
|
0fead62cfc
|
Merge pull request 'feature/1211' (#14) from feature/1211 into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/14
|
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 |
|
chenzhi
|
28e93fe832
|
新增文件
|
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 |
|
陈志
|
9d30d48fac
|
Merge pull request 'feature/st_mange_20201202' (#6) from feature/st_mange_20201202 into release
优化公式
|
4 years ago |
|
chenzhi
|
f4f430cf61
|
优化公式
|
4 years ago |
|
郑永星
|
473cbf5dfd
|
Merge pull request '12月功能提交' (#5) from feature/add_item into release
12月功能提交
|
4 years ago |
|
zhengyongxing
|
23e5632eec
|
12月功能提交
|
4 years ago |
|
chenzhi
|
a3e0ecb949
|
优化结算公式
|
4 years ago |
|
chenzhi
|
0f82acf447
|
优化权限修改
|
4 years ago |
|
郑永星
|
ad5b9be91e
|
Merge pull request '12份功能提交' (#4) from feature/add_item into release
12月功能提交
|
4 years ago |
|
zhengyongxing
|
f804b7af3f
|
12份功能提交
|
4 years ago |
|
郑永星
|
5810b8a6cb
|
Merge pull request 'feature/add_item' (#3) from feature/add_item into release
12份功能提交
|
4 years ago |
|
zhengyongxing
|
e74d46bc49
|
Merge branch 'feature/add_item' of 8.136.139.249:wmtx/platform into feature/add_item
|
4 years ago |
|
zhengyongxing
|
c0aa5d2dbc
|
12份功能提交
|
4 years ago |
|
廖金灵
|
0a0ffddc13
|
Merge pull request 'feature/add_item' (#2) from feature/add_item into release
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/2
|
4 years ago |
|
廖金灵
|
bdad3f8db9
|
Merge branch 'release' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
fb0acddb3f
|
12份功能提交
|
4 years ago |
|
chenzhi
|
753098a85f
|
优化子站点配置
|
4 years ago |