tping
|
304c59be10
|
甲乙方公司
|
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
|
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 |
郑永星
|
6699ce1045
|
Merge pull request '未结算数据的补充' (#23) from feature/add_item into release
未结算数据的补充
|
4 years ago |
|
zhengyongxing
|
f13ee0583c
|
未结算数据的补充
|
4 years ago |
|
chenzhi
|
fb798e82bf
|
优化下游推广公司搜索
|
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 |
|
郑永星
|
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
|
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 |
|
zhengyongxing
|
23e5632eec
|
12月功能提交
|
4 years ago |
|
chenzhi
|
a3e0ecb949
|
优化结算公式
|
4 years ago |
|
zhengyongxing
|
f804b7af3f
|
12份功能提交
|
4 years ago |
|
廖金灵
|
bdad3f8db9
|
Merge branch 'release' into feature/add_item
|
4 years ago |
|
zhengyongxing
|
fb0acddb3f
|
12份功能提交
|
4 years ago |
|
tping
|
481646222f
|
后台 手机号规则 实名认证修改
|
4 years ago |
|
zhengyongxing
|
ec3491943b
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
52ff4a2bc6
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
9bec07c7d4
|
不结算bug修改
|
4 years ago |
|
zhengyongxing
|
747224dae9
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
27ffddfe75
|
Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
# Conflicts:
# Data/update.sql
|
4 years ago |
|
zhengyongxing
|
8bb8e4379f
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
b8af3ea384
|
12月功能提交
|
4 years ago |
|
zhengyongxing
|
7e41ad1e18
|
12月功能提交
|
4 years ago |
|
zyx
|
6b0de87280
|
未结算接口修改
|
4 years ago |
|
chenzhi
|
a741e8d37d
|
订单新增设备类型
|
4 years ago |
|
chenzhi
|
0b979d9b68
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202
|
4 years ago |
|
chenzhi
|
24f3489e65
|
优化导出新增公式
|
4 years ago |
|
chenzhi
|
8d156ffb64
|
新增结算公式
|
4 years ago |
|
zhengyongxing
|
166c1d63d6
|
12月功能提交
|
4 years ago |
|
ELF
|
78caa452b2
|
测试资源添加审核人
|
4 years ago |
|
ELF
|
88402dfac0
|
修改
|
4 years ago |
|
廖金灵
|
9483e4b7b3
|
Merge branch 'feature/add_item' of wmtx/platform into master
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
zhengyongxing
|
7c5c67a87c
|
编辑页面调整,及多个编辑错误修正
|
4 years ago |
|
ELF
|
cf42967f4f
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
|
ELF
|
b28e00b9f2
|
Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check
|
4 years ago |
|
chenzhi
|
3053461ee5
|
优化奖罚排序
|
4 years ago |
|
廖金灵
|
5b096ad2ff
|
Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
|
4 years ago |
|
zhengyongxing
|
923851fea7
|
11月bug修复
|
4 years ago |
|
廖金灵
|
470bcdfebf
|
Merge branch 'feature/add_item' of wmtx/platform into master
11月bug修复
|
4 years ago |