 ELF
|
557f0203ac
|
解决冲突
|
5 years ago |
zhengyongxing
|
1fff2e6c09
|
财务代码搬到新的分支上
|
5 years ago |
|
ELF
|
15d0b454a4
|
修改
|
5 years ago |
|
ELF
|
f167d63c4a
|
修改
|
5 years ago |
|
zhengyongxing
|
15b9efcd7e
|
江息网络漏掉的修改
|
5 years ago |
|
zhengyongxing
|
f63b115641
|
Merge remote-tracking branch 'origin/feature/platfrom_aggregate_finance' into feature/platfrom_aggregate_finance
# Conflicts:
# Application/Admin/View/PromoteCompany/add.html
# Application/Admin/View/PromoteCompany/edit.html
|
5 years ago |
|
zhengyongxing
|
4ff957d0f1
|
将官方渠道修改为江息网络
|
5 years ago |
sunke
|
2a017bfb45
|
loginmodel
|
5 years ago |
|
zhengyongxing
|
132b601f74
|
测试资源搜索功能添加
|
5 years ago |
chenzhi
|
55d49e8b4b
|
优化推广公会列表导出
|
5 years ago |
|
chenzhi
|
1761d37b5c
|
推广公会列表 适配新内外团规则
|
5 years ago |
|
chenzhi
|
d7662eb305
|
推广员现在归属于公司团体
|
5 years ago |
yulingwei
|
ead4a8598e
|
upt
|
5 years ago |
zhengchanglong
|
e6f3329ac8
|
内外团归属BUG修复
|
5 years ago |
|
ELF
|
f7a53c7562
|
Merge branch 'feature/account_safe' into release
|
5 years ago |
liuweiwen
|
394a3e4bb5
|
cp/工会对账系统
|
5 years ago |
|
ELF
|
0a0cedafd5
|
各个系统登录提示安全优化，sessionon_id变更
|
5 years ago |
|
liuweiwen
|
0b3ae062b1
|
优化：推广员新增与编辑的推广公司增加万盟天下科技
新增需求：推广员增加工会归属和工会关系属性
|
5 years ago |
|
zhengyongxing
|
ba59b41fb9
|
数据权限官方渠道添加
|
5 years ago |
|
zhengyongxing
|
d465be8969
|
数据权限提交
|
5 years ago |
|
zhengyongxing
|
ce0e9f943d
|
数据权限bug修正
|
5 years ago |
|
zhengyongxing
|
6dc8366018
|
数据授权修改内容提交
|
5 years ago |
|
ELF
|
905efbfd9a
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into feature/promote
|
5 years ago |
|
jbrazz
|
c8f072f983
|
Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
|
5 years ago |
|
jbrazz
|
2a6d9b7571
|
推广员名称
|
5 years ago |
chenxiaojun
|
9d3dfd622b
|
推广平台->退出登录--更新
|
5 years ago |
|
chenxiaojun
|
467b193037
|
推广平台->退出登录--更新
|
5 years ago |
|
jbrazz
|
c9996e071c
|
fix grand_id
|
5 years ago |
|
jbrazz
|
a8125bf377
|
upt
|
5 years ago |
|
jbrazz
|
736c0fd432
|
fix
|
5 years ago |
|
ELF
|
2ffa024c4c
|
initial
|
5 years ago |