 zhaoyang
|
804993bb76
Merge branch 'feature-wechat' of 121.36.198.49:zy_duanju/duanju_manage into feature-wechat
|
1 gadu atpakaļ |
|
zhaoyang
|
ddbda4a004
上报错误ip
|
1 gadu atpakaļ |
|
zhaoyang
|
39a18b55fb
上报错误ip
|
1 gadu atpakaļ |
|
zhaoyang
|
00810509e8
上报错误ip
|
1 gadu atpakaļ |
|
zhaoyang
|
5757e6f584
异常上报
|
1 gadu atpakaļ |
|
zhaoyang
|
98293d63de
异常上报
|
1 gadu atpakaļ |
|
zhaoyang
|
3ae9d89bc1
异常上报
|
1 gadu atpakaļ |
|
zhaoyang
|
0e2af83887
系统异常日志上报
|
1 gadu atpakaļ |
 zqwang
|
b9d2a7b487
Merge branch 'wx-kw' into feature-wechat
|
1 gadu atpakaļ |
|
zqwang
|
cf85be4af4
Merge branch 'wx-kw' into feature-wechat
|
1 gadu atpakaļ |
|
zhaoyang
|
ea6e5dc2d3
Merge branch 'feature-wechat' of 121.36.198.49:zy_duanju/duanju_manage into feature-wechat
|
1 gadu atpakaļ |
|
zhaoyang
|
161459a79d
公众号，不分页
|
1 gadu atpakaļ |
|
zhaoyang
|
3302189a34
fix公众号粉碎数
|
1 gadu atpakaļ |
|
zqwang
|
cf6be0f764
Merge branch 'wx-kw' into feature-wechat
|
1 gadu atpakaļ |
|
zhaoyang
|
d33e3eb1af
Merge branch 'master' into feature-wechat
|
1 gadu atpakaļ |
|
zqwang
|
ed266f16a3
Merge branch 'wx-kw' into feature-wechat
|
1 gadu atpakaļ |
|
zqwang
|
9872492464
Merge branch 'wx-kw' into feature-wechat
|
1 gadu atpakaļ |
 liuzejian
|
3b0cb8f596
Merge branch 'liuzj-1001016-dev' into feature-wechat
|
1 gadu atpakaļ |
|
liuzejian
|
1a81388076
Merge branch 'liuzj-1001016-dev' into feature-wechat
|
1 gadu atpakaļ |
|
zqwang
|
970a65fc13
Merge branch 'wx-kw' into feature-wechat
|
1 gadu atpakaļ |
|
zhaoyang
|
b62ea203a7
公众号列表新增优化师字段
|
1 gadu atpakaļ |
|
zhaoyang
|
bf26634aea
公众号列表查询
|
1 gadu atpakaļ |
|
zhaoyang
|
20f1c8deeb
获取用户数
|
1 gadu atpakaļ |
|
zqwang
|
1da84c74b8
Merge branch 'wx-kw' into feature-wechat
|
1 gadu atpakaļ |
|
zhaoyang
|
bd1bd90247
冲突
|
1 gadu atpakaļ |
|
zhaoyang
|
2f146649f8
公众号列表
|
1 gadu atpakaļ |
|
liuzejian
|
88bda0b343
Merge branch 'feature-wechat' into liuzj-1001016-dev
|
1 gadu atpakaļ |
|
liuzejian
|
0bab11da69
路由切换支持
|
1 gadu atpakaļ |
|
liuzejian
|
cbd90a9b9d
客服消息路由
|
1 gadu atpakaļ |
|
liuzejian
|
e0dda78f0f
客服消息的后台管理操作
|
1 gadu atpakaļ |
|
zqwang
|
051e304e1c
创建微信公众号模块
|
1 gadu atpakaļ |
|
zqwang
|
47dfdeb54a
创建微信公众号模块
|
1 gadu atpakaļ |
|
zqwang
|
c48ec8629b
百分比修复
|
1 gadu atpakaļ |
|
zqwang
|
cd677637bf
充值率修复
|
1 gadu atpakaļ |
|
zqwang
|
23e79a563c
充值率修复
|
1 gadu atpakaļ |
|
zqwang
|
832966f48c
修复通知时间不对
|
1 gadu atpakaļ |
|
zqwang
|
6e27e02865
Merge remote-tracking branch 'origin/liuzj-06-29' into stable
|
1 gadu atpakaļ |
|
zqwang
|
e8b3e7b2e5
Merge branch 'wzq-tj-xyh' into stable
|
1 gadu atpakaļ |
|
zhaoyang
|
c5e0bac1ef
Merge branch 'stable' of 121.36.198.49:zy_duanju/duanju_manage
|
1 gadu atpakaļ |
|
zhaoyang
|
838e10c3d8
conflict
|
1 gadu atpakaļ |
|
zhaoyang
|
3e54a2b1f8
export duanjv 统计
|
1 gadu atpakaļ |
|
zhaoyang
|
98cd1ab93b
conflict
|
1 gadu atpakaļ |
|
zhaoyang
|
fe63c93e5d
短剧统计
|
1 gadu atpakaļ |
|
zhaoyang
|
e4723d6ab6
Merge branch 'test' of 121.36.198.49:zy_duanju/duanju_manage
|
1 gadu atpakaļ |
|
zhaoyang
|
86e724ee70
短剧统计
|
1 gadu atpakaļ |
|
liuzejian
|
f4f11fa28f
Merge branch 'liuzj-1001006' into test
|
1 gadu atpakaļ |
|
zqwang
|
9bd62707ac
Merge branch 'wzq-tj-xyh' into test
|
1 gadu atpakaļ |
|
liuzejian
|
c452cab0f3
Merge branch 'liuzj-1000959-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
55ddab9ed2
Merge branch 'liuzj-1000959-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
606fb64df3
Merge branch 'liuzj-1000959-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
dbe2e42533
Merge branch 'liuzj-1000959-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
39bdbccd28
Merge branch 'liuzj-1000959-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
7828409955
1
|
1 gadu atpakaļ |
|
liuzejian
|
f10961770e
q
|
1 gadu atpakaļ |
|
liuzejian
|
6854367bcf
Merge branch 'liuzj-1000959-dev' into test
|
1 gadu atpakaļ |
|
zqwang
|
6fe4dd41fa
Merge branch 'fix' into test
|
1 gadu atpakaļ |
|
zqwang
|
840ac44b73
Merge branch 'test' of 121.36.198.49:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
zqwang
|
4af09e8932
Merge branch 'fix' into test
|
1 gadu atpakaļ |
|
zqwang
|
1c80521b69
Merge branch 'test' of 121.36.198.49:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
zqwang
|
796cc81202
Merge branch 'liuzj-1000976-dev' of 121.36.198.49:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
liuzejian
|
466db449bb
Merge branch 'liuzj-1000976-dev' into test
|
1 gadu atpakaļ |
|
zqwang
|
8a250ba350
Merge branch 'fix' into tes# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
|
1 gadu atpakaļ |
|
liuzejian
|
fa72ab6c48
Merge branch 'liuzj-1000959-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
a91c8c0805
Merge branch 'liuzj-1000990-dev' into test
|
1 gadu atpakaļ |
|
zqwang
|
b737d83669
Merge branch 'wzq-skyh' of 121.36.198.49:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
zqwang
|
15b5898652
Merge branch 'wzq-skyh' of 121.36.198.49:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
zqwang
|
1715a3da50
Merge branch 'wzq-skyh' of 121.36.198.49:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
liuzejian
|
6691c9a1bb
Merge branch 'stable' into liuzj-1000979-dev
|
1 gadu atpakaļ |
|
liuzejian
|
286e7c98de
染色规则配置
|
1 gadu atpakaļ |
|
zhaoyang
|
f76b6d769b
Merge branch 'master' into stable
|
1 gadu atpakaļ |
|
zqwang
|
0db4ead11f
暂存
|
1 gadu atpakaļ |
|
zqwang
|
6f964fb476
解决冲突
|
1 gadu atpakaļ |
|
zqwang
|
d7cde1e4db
结算更新
|
1 gadu atpakaļ |
|
zqwang
|
8c25b2e689
频道删除
|
1 gadu atpakaļ |
|
zqwang
|
1e4a30614b
频道删除
|
1 gadu atpakaļ |
|
zqwang
|
79e0a6cf01
频道删除
|
1 gadu atpakaļ |
|
zqwang
|
bfbb78cdd4
频道管理
|
1 gadu atpakaļ |
|
zqwang
|
c2a99e7651
更新轮播图
|
1 gadu atpakaļ |
|
zqwang
|
49ff48f712
更新轮播图
|
1 gadu atpakaļ |
|
zqwang
|
27ace29b50
更新
|
1 gadu atpakaļ |
|
liuzejian
|
717b0438db
上下架
|
1 gadu atpakaļ |
|
liuzejian
|
8ef6ea9af6
首页列表配置
|
1 gadu atpakaļ |
|
liuzejian
|
17c864d414
Merge branch 'liuzj-pay-dev' into liuzj-fist-page-dev
|
1 gadu atpakaļ |
|
liuzejian
|
70f4fcc4cb
优化导入
|
1 gadu atpakaļ |
|
liuzejian
|
2754e0e1d9
Merge branch 'liuzj-youhuashi-fix' into stable
|
1 gadu atpakaļ |
|
zqwang
|
4235232a16
Merge branch 'order' into stable
|
1 gadu atpakaļ |
|
liuzejian
|
d6be31a34d
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
021fc9c42a
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
zqwang
|
b569dc81e6
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
c8182b1441
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
3316b7403d
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
liuzejian
|
7a24feb9c7
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
 admin
|
73f8544474
Merge branch 'test' of qk:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
admin
|
1d3823a73e
Merge branch 'master' of qk:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
zqwang
|
c9bd39f5d7
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
d09217961e
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zhaoyang
|
18776b4dac
allocation miniprogram fix
|
1 gadu atpakaļ |
|
liuzejian
|
57a55d6545
视频下载地址,是用源文件
|
1 gadu atpakaļ |
|
liuzejian
|
f3d3446765
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
aba2639fcf
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
5edcc85ea4
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
bab7b964ef
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
zqwang
|
6ab281cb8a
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
695c5db659
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
17bda237da
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
852cccf86b
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
6c733dbd2e
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
e0be34d6d4
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
0d3de12b13
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
2e15dabb58
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
89d62da6a7
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
2c39f3fcb7
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
a3b4152cf0
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
liuzejian
|
f576f180dd
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
zqwang
|
6d36f6a160
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
6b0ce28ff9
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
53b7954f1d
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
dc1ad67661
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
zqwang
|
b00b1c07cc
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
liuzejian
|
9743c580d6
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
f44622f0f9
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
c9e25f58b7
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
zqwang
|
d1ddaae132
Merge branch 'order' into test
|
1 gadu atpakaļ |
|
liuzejian
|
d643457162
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
d225603f9f
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
60b475d610
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
7010a9af01
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
dbdbb467a3
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
40e10304e4
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
75ee4259e2
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
b2572bfc8e
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
ae9e252e0a
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
zqwang
|
7d8218c15e
优化师选择选，推广选择项增加小程序参数
|
1 gadu atpakaļ |
|
zqwang
|
8c41cf43eb
优化师选择选，推广选择项增加小程序参数
|
1 gadu atpakaļ |
|
zqwang
|
c2dbb31d61
阅读记录
|
1 gadu atpakaļ |
|
zqwang
|
08e2745b57
用户详情充值记录分页
|
1 gadu atpakaļ |
|
zqwang
|
7ac80d3ae5
用户详情充值记录分页
|
1 gadu atpakaļ |
|
zqwang
|
ebd5a9d583
更新用户订单分页
|
1 gadu atpakaļ |
|
zqwang
|
61a4abef4f
更新
|
1 gadu atpakaļ |
|
zqwang
|
8bf3aa33a1
去除空格
|
1 gadu atpakaļ |
|
zqwang
|
6c8fa3e550
更新
|
1 gadu atpakaļ |
|
zqwang
|
b0f45e0bbe
更新
|
1 gadu atpakaļ |
|
zqwang
|
07c16ff8e8
创建
|
1 gadu atpakaļ |
|
zqwang
|
b4e52d4fae
结算模块修正
|
1 gadu atpakaļ |
|
zqwang
|
e9a6cd4174
用户充值记录增加账户属性隔离
|
1 gadu atpakaļ |
|
liuzejian
|
459d1a12c3
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
zqwang
|
d571cf3ed6
Merge branch 'test' of 121.36.198.49:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
zqwang
|
3734cb0ae7
Merge branch 'master' into test
|
1 gadu atpakaļ |
|
zqwang
|
87c16f5f5c
Merge branch 'master' into test
|
1 gadu atpakaļ |
|
zqwang
|
577c48e25f
:wq
|
1 gadu atpakaļ |
|
zqwang
|
836d3f7029
Merge branch 'wzq-sj' into test
|
1 gadu atpakaļ |
|
admin
|
a31579932d
Merge branch 'test' of qk:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
admin
|
07b185e9ac
Merge branch 'master' of qk:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
zqwang
|
6979dfd87c
Merge branch 'wzq_user-detail' into test
|
1 gadu atpakaļ |
|
zqwang
|
2b8d74d977
Merge branch 'wzq_user-detail' into test
|
1 gadu atpakaļ |
|
liuzejian
|
7f5a304877
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
bcfc7b9964
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
admin
|
b526919411
Merge branch 'master' of qk:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
liuzejian
|
90752c6850
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
6db01eb019
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
712e38d8bf
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
afb2157a9b
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
020b9d842c
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
5ece488d61
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
8fffda13f7
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
f391c37743
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
a801ee0fd1
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
e75ca62372
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
0023a3c67c
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
f3484d4363
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
43775ead58
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
9f26c40a32
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
 tgz
|
328c3250e6
去除无用md
|
1 gadu atpakaļ |
|
liuzejian
|
ef34d16898
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
897b345253
Merge branch 'test' of qk:zy_duanju/duanju_manage into test
|
1 gadu atpakaļ |
|
liuzejian
|
ed54edb64f
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
8c69a98c00
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
liuzejian
|
395887643c
Merge branch 'liuzj-permission-dev' into test
|
1 gadu atpakaļ |
|
zhaoyang
|
d5b53554f9
pay template
|
1 gadu atpakaļ |
|
zhaoyang
|
39fbb64f9e
pay template
|
1 gadu atpakaļ |
|
zhaoyang
|
7b4b35d465
merge
|
1 gadu atpakaļ |
|
zhaoyang
|
5f4efc7647
pay template
|
1 gadu atpakaļ |
|
zhaoyang
|
78922e2913
miniprogram index paginate
|
1 gadu atpakaļ |
|
zhaoyang
|
975e0f69bf
comment fix
|
1 gadu atpakaļ |
|
zhaoyang
|
56e0384132
comment fix
|
1 gadu atpakaļ |
|
zhaoyang
|
92c49d7ad8
comment
|
1 gadu atpakaļ |
|
zhaoyang
|
6f85886aed
fix message
|
2 gadi atpakaļ |
|
zhaoyang
|
4a843fa286
miniprogram update fix
|
2 gadi atpakaļ |
|
zhaoyang
|
a42d014adb
allocation miniprogram
|
2 gadi atpakaļ |
|
zhaoyang
|
fb1aaa4e36
allocation miniprogram
|
2 gadi atpakaļ |
|
zhaoyang
|
6e5cfe4a01
fix error
|
2 gadi atpakaļ |
|
zhaoyang
|
47ffb0f937
manage
|
2 gadi atpakaļ |
|
zhaoyang
|
06a40478e7
test
|
2 gadi atpakaļ |
|
zhaoyang
|
4206ffaae0
test
|
2 gadi atpakaļ |
|
zhaoyang
|
d1097cee85
test
|
2 gadi atpakaļ |
|
zhaoyang
|
e21bce9c0a
test
|
2 gadi atpakaļ |
|
zhaoyang
|
1dff38e032
test
|
2 gadi atpakaļ |
|
zhaoyang
|
f9b7ebcbcd
commflict
|
2 gadi atpakaļ |
|
zhaoyang
|
75960088d0
miniprogram
|
2 gadi atpakaļ |
|
zhaoyang
|
25ddff0110
init miniprogram
|
2 gadi atpakaļ |
|
zqwang
|
71f5d8d83e
新增Cp管理
|
2 gadi atpakaļ |
|
zqwang
|
15c41b16d7
Merge branch 'liuzj-permission-dev' of 121.36.198.49:zy_duanju/duanju_manage into cp
|
2 gadi atpakaļ |
|
zqwang
|
4f9a0856a5
更新
|
2 gadi atpakaļ |
|
zqwang
|
3ebc92e63b
创建短剧cp管理模块
|
2 gadi atpakaļ |
|
zqwang
|
9db59a00d9
删除文件
|
2 gadi atpakaļ |
|
zqwang
|
d8c7ab9516
创建模块
|
2 gadi atpakaļ |
|
liuzejian
|
f92dbe8241
init
|
2 gadi atpakaļ |
