p31729568
|
b41ca035dd
|
add whitelist for wxpay test
|
6 years ago |
|
p31729568
|
efe1991773
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
65c91f890a
|
open wechat pay method
|
6 years ago |
 caishi
|
ab054713bf
|
合作伙伴-产学联盟
|
6 years ago |
 daiao
|
8c57e3363e
|
合作伙伴增加产学联盟
|
6 years ago |
|
p31729568
|
e8f40b9430
|
add wechat pay support
|
6 years ago |
|
p31729568
|
d8e3214a16
|
modify trainings
|
6 years ago |
|
p31729568
|
92c7dd4ead
|
modify trainings
|
6 years ago |
|
p31729568
|
56bea6da3a
|
modify trainings
|
6 years ago |
|
p31729568
|
3a301499ca
|
modify trainings
|
6 years ago |
|
caishi
|
aeb3fe9b0e
|
Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings
|
6 years ago |
|
caishi
|
dba3a65800
|
支付信息
|
6 years ago |
|
p31729568
|
c0a3620bb4
|
training: modify flow
|
6 years ago |
|
caishi
|
0d5d7f63c2
|
Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings
|
6 years ago |
|
caishi
|
d02d10e95c
|
支付-微信开通提示
|
6 years ago |
|
p31729568
|
567bcfdf65
|
business add permission
|
6 years ago |
|
p31729568
|
098c9e3186
|
modify
|
6 years ago |
|
p31729568
|
a893358e29
|
trainings: modify
|
6 years ago |
|
p31729568
|
c69ed1c1f4
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
5816bc25cb
|
trainings: fix
|
6 years ago |
|
caishi
|
8ebc32383a
|
支付--适配iphone
|
6 years ago |
|
p31729568
|
e572e652d0
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
0e24d92643
|
tranings: fix bug
|
6 years ago |
|
p31729568
|
f84cfd45f0
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
e5a1bd5fc8
|
training: add offline later pay
|
6 years ago |
|
p31729568
|
4b1658681b
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
3ac89e3f65
|
training: add offline pay
|
6 years ago |
|
p31729568
|
6c3054f8a4
|
trainings: add pay and result page
|
6 years ago |
|
p31729568
|
8fddd8959e
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
48cf73dbbf
|
modify training
|
6 years ago |
|
caishi
|
c15546369c
|
支付-发票类型
|
6 years ago |
|
caishi
|
8b27e66fc3
|
发票类型
|
6 years ago |
|
caishi
|
335988a0b1
|
支付折扣
|
6 years ago |
 杨树明
|
7f3f97b03d
|
调整题目多行显示体验
|
6 years ago |
|
p31729568
|
64cc6c9fb4
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
46450f2068
|
training: remove training category column
|
6 years ago |
|
p31729568
|
614eca8287
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
50f9946b6b
|
fix
|
6 years ago |
|
p31729568
|
87861d1bd7
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
b56921ca68
|
fix
|
6 years ago |
|
p31729568
|
e5dd2e40b7
|
merge
|
6 years ago |
|
p31729568
|
525b47e36c
|
modify
|
6 years ago |
|
p31729568
|
8ddfbcc7c7
|
training: add form check
|
6 years ago |
|
p31729568
|
1c52835c1a
|
training: enroll update
|
6 years ago |
|
p31729568
|
7d6c272f34
|
fix
|
6 years ago |
|
caishi
|
37c529b356
|
支付
|
6 years ago |
|
caishi
|
fa2adad9ab
|
Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings
Conflicts:
app/views/trainings/enroll.html.erb
|
6 years ago |
|
caishi
|
b5730f6dcd
|
信息技术新工科产学研联盟师资研修
|
6 years ago |
|
daiao
|
94f1899930
|
课程等级体系导出excel
|
6 years ago |
cxt
|
f939186ca3
|
报名调整
|
6 years ago |
|
cxt
|
3e7cf794b6
|
大数据和人工智能的报名页
|
6 years ago |
|
cxt
|
15e50f3ee3
|
调整
|
6 years ago |
|
daiao
|
7126019a38
|
运营人员有权限查看课程相应列表的权限
|
6 years ago |
|
caishi
|
1fe13e8f4a
|
trainings(联盟师资培训)
|
6 years ago |
|
杨树明
|
620e510617
|
调整错误描述
|
6 years ago |
|
p31729568
|
5582c4a863
|
fix error because course not have end time
|
6 years ago |
|
p31729568
|
2a6364b27e
|
management user: add province filter
|
6 years ago |
|
daiao
|
5b07b39fb2
|
运营人员也能查看课程
|
6 years ago |
|
cxt
|
afc01ad67b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
p31729568
|
1523b992e0
|
modify school management view
|
6 years ago |
|
cxt
|
186bdbd758
|
Merge branch 'develop' into educoder
|
6 years ago |
|
p31729568
|
10b31905ad
|
fix school management data incorrent bug
|
6 years ago |
|
p31729568
|
ef8b9bd5d3
|
fix school management grow data
|
6 years ago |
|
daiao
|
d66cdb9f60
|
Merge branch 'develop' into educoder
|
6 years ago |
|
daiao
|
1cdc0bdfd6
|
学校统计页面字面更改：
|
6 years ago |
|
p31729568
|
4ebe247633
|
modify management school report list && fix some bug
|
6 years ago |
|
daiao
|
0669dcf907
|
测试
|
6 years ago |
|
daiao
|
41e897150b
|
超级管理页面，用户列表的更新用户信息的金币和经验链接错误
|
6 years ago |
|
p31729568
|
a720a5477b
|
remove ","
|
6 years ago |
|
p31729568
|
e1a8372b2b
|
management export school report xlsx add column
|
6 years ago |
 jingquan huang
|
a2de61dc23
|
..
|
6 years ago |
|
jingquan huang
|
ce480703f4
|
..
|
6 years ago |
 hjm
|
57171297c1
|
b
|
6 years ago |
|
hjm
|
939b575871
|
b
|
6 years ago |
|
p31729568
|
c389f0f2a6
|
modify school active user count
|
6 years ago |
|
p31729568
|
f0d41767e7
|
modify school contrast order logical
|
6 years ago |
|
p31729568
|
ec8b047228
|
add shixun homework and shixun evaluate count to school daily report
|
6 years ago |
|
p31729568
|
15a2f16453
|
remove shixuns evaluate count code
|
6 years ago |
|
hjm
|
9565048465
|
b
|
6 years ago |
|
hjm
|
e26133f945
|
b
|
6 years ago |
|
p31729568
|
f19cbcb1c6
|
scholl management add shixun count and shixun evaluate count
|
6 years ago |
|
hjm
|
3e8b1aa4d8
|
b
|
6 years ago |
|
hjm
|
89fcc164e4
|
b
|
6 years ago |
|
p31729568
|
89acf0b0cd
|
modify school manager statistic text
|
6 years ago |
|
jingquan huang
|
7e87cd2f82
|
vnc
|
6 years ago |
|
daiao
|
f3a25e9812
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
92a08caf95
|
1
|
6 years ago |
|
cxt
|
8337331103
|
后端-试卷、试卷题库的实训题增加改名称的功能
|
6 years ago |
|
daiao
|
0f359082e5
|
超级管理员评测时间详情页面增加最大执行时间
|
6 years ago |
|
杨树明
|
f06a1b5df6
|
实训题 前端增加题目修改
|
6 years ago |
|
cxt
|
c49f381345
|
调整
|
6 years ago |
|
cxt
|
2968f969b3
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
jingquan huang
|
c10ed929da
|
评测记录添加唯一表示
|
6 years ago |
|
cxt
|
ecff82dc0c
|
超级管理员的课堂列表增加按课堂名称搜索
|
6 years ago |
|
cxt
|
58bf8a9947
|
实训作业的重命名功能
|
6 years ago |
|
jingquan huang
|
294e5440eb
|
Merge branch 'develop' into educoder
|
6 years ago |
|
jingquan huang
|
f3f879973d
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
29cf900c99
|
shixun默认值
|
6 years ago |
|
杨树明
|
c677f58ca1
|
b
|
6 years ago |
|
杨树明
|
2c20ad2ed5
|
b
|
6 years ago |
|
杨树明
|
02194f5503
|
b
|
6 years ago |
|
hjm
|
478b73bbfb
|
b
|
6 years ago |
|
hjm
|
95ded6f4ca
|
b
|
6 years ago |
|
hjm
|
0e2dcf12fd
|
md
|
6 years ago |
|
hjm
|
78a2cfb044
|
md
|
6 years ago |
|
hjm
|
add56f399b
|
md
|
6 years ago |
|
hjm
|
f2bde62acd
|
md
|
6 years ago |
|
hjm
|
cfed9da95e
|
b
|
6 years ago |
|
caishi
|
cb20217d49
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
8b42018d40
|
实训课程右侧教学团队
|
6 years ago |
|
杨树明
|
e38e35c72b
|
b
|
6 years ago |
|
杨树明
|
436571090a
|
b
|
6 years ago |
|
杨树明
|
d5e334738f
|
b
|
6 years ago |
|
杨树明
|
b7c7127f3a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
杨树明
|
b6953aa038
|
b
|
6 years ago |
|
hjm
|
ce9dc71211
|
b
|
6 years ago |
|
hjm
|
a2acd872c9
|
Merge branch 'dev_ec' into develop
|
6 years ago |
|
jingquan huang
|
eb705d526e
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
caishi
|
7d2730cfa5
|
工程认证
|
6 years ago |
|
hjm
|
80f9ee5ed5
|
b
|
6 years ago |
guange
|
a2ca817642
|
merge
|
6 years ago |
|
guange
|
88096c807f
|
加入质量检测请求
|
6 years ago |
|
daiao
|
db3422a8f1
|
Merge branch 'develop' into educoder
|
6 years ago |
jasder
|
36666c961b
|
FIX Adj jump url
|
6 years ago |
|
cxt
|
d69fd728a3
|
优化作业列表和作品列表
|
6 years ago |
|
daiao
|
d4ad370635
|
职业路径页面无法编辑
|
6 years ago |
|
cxt
|
cb03317076
|
实训作业列表优化
|
6 years ago |
|
daiao
|
6d18d11200
|
1
|
6 years ago |
|
daiao
|
b86841fe01
|
评测页面调整
|
6 years ago |
|
daiao
|
741b51f668
|
超级管理员评测页面排序显示问题
|
6 years ago |
|
daiao
|
9beb3131d2
|
评测时间创建时间
|
6 years ago |
|
daiao
|
0292431bec
|
创建时间
|
6 years ago |
|
p31729568
|
db64dbe8e9
|
modify school grow data list
|
6 years ago |
|
daiao
|
c67157ca7e
|
【实训】允许跳关，但是用户点后续关卡的挑战按钮都跳到了第一关
|
6 years ago |
|
daiao
|
9bb4442121
|
【课堂】学生的成绩导出，增加邮箱信息的导出
|
6 years ago |
|
daiao
|
fa2cc5b867
|
1
|
6 years ago |
|
杨树明
|
146873ffdc
|
解决生产环境】项目-issue中的结束时间日历显示不全导致用户无法选择
|
6 years ago |
|
daiao
|
2912f32041
|
超级管理员的课堂列表页面增加 课堂学生的“评测次数”统计显示
|
6 years ago |
|
p31729568
|
5360ed4d3a
|
fix save school fail bug
|
6 years ago |
|
daiao
|
2374e6f31c
|
超级管理员评测时间页面增加按时间搜索并增加最大执行时间列
|
6 years ago |
|
jingquan huang
|
034312aec4
|
简略版统计
|
6 years ago |
|
cxt
|
b8daa7e818
|
调整导入学生账号
|
6 years ago |
|
cxt
|
1350e8fb59
|
超级管理员的账号导入
|
6 years ago |
|
cxt
|
88d4bed989
|
升级通知的时间间隔
|
6 years ago |
|
daiao
|
1d197501bd
|
1
|
6 years ago |
|
jingquan huang
|
1b2494ea5e
|
Merge branch 'educoder' into develop
|
6 years ago |
|
jingquan huang
|
3685c386db
|
实训临时一些优化
|
6 years ago |
|
daiao
|
b4bc64e401
|
图片类实训打印日志
|
6 years ago |
|
p31729568
|
8c3767cfa2
|
fix my account page reject trial auth notify modal bug
|
6 years ago |
|
p31729568
|
dbaed7bc12
|
modify reject trial auth modal
|
6 years ago |
|
cxt
|
aa6e3dddbf
|
试用授权未审批页面增加学校统计链接
|
6 years ago |
|
cxt
|
6a80a0bbf1
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
31635eb93f
|
试卷题的表格样式
|
6 years ago |
|
p31729568
|
fcfda1f9a2
|
fix export school statistic xls empty bug
|
6 years ago |
|
p31729568
|
35e26e22f7
|
remove debug code
|
6 years ago |
|
p31729568
|
1fa27ae9d3
|
fix reject trial auth feature issue
|
6 years ago |
|
cxt
|
3c76641df3
|
调整
|
6 years ago |
|
cxt
|
4c2d678253
|
调整
|
6 years ago |
|
p31729568
|
05cd6b874b
|
reject trial authorization modal feature
|
6 years ago |
|
杨树明
|
859e3e9a62
|
后台撤销授权功能优化 （前端）
|
6 years ago |
|
杨树明
|
c7cc754046
|
b
|
6 years ago |
 Alec Zhou
|
8b711ac57d
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
Alec Zhou
|
21043d1a6c
|
修复未绑定邮箱用户点击开始实战按钮页面无反应的bug
|
6 years ago |
|
p31729568
|
1298e748f2
|
modify school statistic service to decrease response time
|
6 years ago |
|
p31729568
|
0f6e2b0bf8
|
do not save useless school daily report data && clear school daily report useless data rake
|
6 years ago |
|
daiao
|
09c221b5b5
|
实训报告取分
|
6 years ago |
|
p31729568
|
bfe8f6800f
|
fix css display issue && fix export school report error
|
6 years ago |
|
p31729568
|
8348c95b57
|
modify school contrast data feature
|
6 years ago |
|
p31729568
|
6a08ec9a27
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
p31729568
|
50d7ed2deb
|
export school statistic data feature
|
6 years ago |
|
daiao
|
731d8532e4
|
1
|
6 years ago |
|
daiao
|
b49c1f5752
|
1
|
6 years ago |
|
cxt
|
14b2ce10da
|
Merge branch 'educoder' into develop
|
6 years ago |
|
cxt
|
fdec1f663d
|
超级管理员的试用授权“已审批”增加学院统计
|
6 years ago |
|
jingquan huang
|
14f83779a3
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
jingquan huang
|
da8d83c8ef
|
导航问题
|
6 years ago |
|
daiao
|
ef5095c070
|
1
|
6 years ago |
|
jingquan huang
|
7cee6ac4ce
|
..
|
6 years ago |
|
daiao
|
0c82824439
|
1
|
6 years ago |
|
jingquan huang
|
a715d33728
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
a8d347bbe4
|
用户权限角色配置默认错误
|
6 years ago |
|
p31729568
|
35ec3b1744
|
fix school data contrast percentage zero issue
|
6 years ago |
|
jingquan huang
|
01017c3bd3
|
checkout box选择运营人员
|
6 years ago |
|
jingquan huang
|
fb1ba699cb
|
..
|
6 years ago |
|
jingquan huang
|
c349dd1621
|
..
|
6 years ago |
|
jingquan huang
|
b68720ee38
|
运营人员
|
6 years ago |
|
p31729568
|
2be42bebe5
|
remove order in school data contrast feature
|
6 years ago |
|
jingquan huang
|
bffc6c363f
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
5c6b6f4c95
|
添加运营定制功能
|
6 years ago |
|
p31729568
|
88431ecd73
|
fix rebase
|
6 years ago |
|
p31729568
|
01668fe3f8
|
school contrast data feature
|
6 years ago |
|
jingquan huang
|
ca8387e2e6
|
Merge branch 'educoder' into develop
|
6 years ago |
|
daiao
|
c140b70818
|
合作伙伴改版
|
6 years ago |
|
jingquan huang
|
2651225563
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
jingquan huang
|
085e1ec44d
|
首页的一些优化
|
6 years ago |
|
winse
|
372db525bd
|
management school report feature
|
6 years ago |
|
jingquan huang
|
978fbf47e5
|
个人主页的一些优化
|
6 years ago |
|
杨树明
|
1832e91b4e
|
build 测试
|
6 years ago |
|
jingquan huang
|
a71064b8e7
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
jingquan huang
|
cdfda26c99
|
登录页面优化
|
6 years ago |
|
jingquan huang
|
f82c7b26f8
|
本地版优化
|
6 years ago |
|
cxt
|
3e44fe368b
|
学生身份隐藏新建课堂入口
|
6 years ago |
|
daiao
|
84769b7e53
|
删除实例单位的示例2字
|
6 years ago |
|
杨树明
|
22e5e7f60a
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
杨树明
|
597a66b764
|
【后台管理】新增需求（运营统计报表 对比报表 新增对比报表 （前端
|
6 years ago |
|
caishi
|
882b6acd1f
|
培养目标页面列表行信息显示修改
|
6 years ago |
|
杨树明
|
33d4027a8c
|
客户项目列表页调整
|
6 years ago |
|
hjm
|
c3ed1bbf14
|
b
|
6 years ago |
|
caishi
|
ca9e721dfe
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
Conflicts:
app/views/challenges/_edit_evaluating_page.html.erb
|
6 years ago |
|
caishi
|
73e890aaf6
|
超级管理员-合作伙伴新增菜单操作选项
|
6 years ago |
|
daiao
|
688c721bd3
|
1
|
6 years ago |
|
caishi
|
e836d333ea
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
caishi
|
23860440ff
|
评测设置保存后刷新页面
|
6 years ago |
|
cxt
|
787acee2ea
|
滚动到顶部
|
6 years ago |
|
cxt
|
b9da38e82a
|
调整
|
6 years ago |
|
杨树明
|
edf1762ae2
|
新建入口调整
|
6 years ago |
|
cxt
|
432fe28c54
|
在用户与超级管理员的私信窗口，增加发送问题页网址的文字说明
|
6 years ago |
|
cxt
|
4eeb6f1fcc
|
平台的用户反馈增加“问题页面网址”输入入口，且必填
|
6 years ago |
|
cxt
|
e1fc755f49
|
调整
|
6 years ago |
|
cxt
|
deaf1c78d1
|
调整
|
6 years ago |
|
cxt
|
63ac324477
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
5e0b771412
|
调整
|
6 years ago |
|
杨树明
|
ffdbf3c782
|
暂无数据显示新建入口
|
6 years ago |
|
cxt
|
d62ffc27ff
|
“合作伙伴”的管理员用户在“客户管理”页面中增加最新课堂动态时间
|
6 years ago |
|
cxt
|
44f7cebbed
|
调整
|
6 years ago |
|
cxt
|
728c0f3ba1
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
3f63a51499
|
个人主页的新建入口
|
6 years ago |
|
杨树明
|
81eb573c03
|
最新课堂动态时间 根据测试要求调整滑动样式
|
6 years ago |
|
cxt
|
5e0cea8e88
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
e7c04e8c58
|
实训课程的教学团队新增删除、上移、下移的功能
|
6 years ago |
|
杨树明
|
6c599e362e
|
个人主页新增新建“课堂”、“实训”、“实训课程”、“项目”入口
|
6 years ago |
|
杨树明
|
ff98ef9463
|
实训课程“教学团队”排序功能优化
|
6 years ago |
|
daiao
|
affb47f79e
|
1:
|
6 years ago |
|
daiao
|
35a99b2ef0
|
Merge branch 'develop' into educoder
|
6 years ago |
|
jingquan huang
|
ba49b555cb
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
66a1a9027a
|
找回密码后端加验证
|
6 years ago |
|
daiao
|
bf19cc6920
|
已发布的实训运行创建者修改脚本
|
6 years ago |
|
jingquan huang
|
210d138fb9
|
vnc
|
6 years ago |
|
daiao
|
ad84f98c37
|
1
|
6 years ago |
|
daiao
|
4fb4e7dbc9
|
1
|
6 years ago |
|
daiao
|
44adbf8e82
|
1
|
6 years ago |
|
cxt
|
94e3289746
|
调试
|
6 years ago |
|
cxt
|
1d25444159
|
滚动翻页
|
6 years ago |
|
cxt
|
885ace98a9
|
搜索
|
6 years ago |
|
cxt
|
4cfc9a6171
|
Merge branch 'dev_partners' into develop
|
6 years ago |
|
cxt
|
062f117191
|
搜索
|
6 years ago |
|
caishi
|
afc456c9a3
|
Merge branch 'dev_partners' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_partners
Conflicts:
app/views/managements/partners.html.erb
|
6 years ago |
|
daiao
|
aa13f63e90
|
Merge branch 'dev_partners' into develop
|
6 years ago |
|
caishi
|
c332ea4b0f
|
清空搜索框内容
|
6 years ago |
|
cxt
|
2e3c438d79
|
去掉多余的客户管理
|
6 years ago |
