Commit Graph

6308 Commits

Author SHA1 Message Date
zhouna
db7b726eb3 Merge branch 'release/1226' into dev 2019-12-31 11:54:57 +08:00
wangmingzhe
ffad10c76a Merge branch 'release/1226' of http://112.124.100.131/GFRS/ebiz-h5 into release/1226 2019-12-31 11:52:19 +08:00
zhouna
bde07cde08 Merge branch 'release/1226' into dev 2019-12-31 11:24:14 +08:00
zhouna
09207f3000 [FIX]孝心保建议书分享配置 2019-12-31 11:23:33 +08:00
zhouna
316f91d4f0 Merge branch 'feature/GFRS-315_【1230】开门红数据报表' 2019-12-30 18:11:25 +08:00
zhouna
ff1c6e33a0 Merge branch 'hotfix_证件截止与长期判断修改' into dev 2019-12-30 17:18:37 +08:00
zhouna
3deffc5b11 [FIX]证件截止日期与长期修改 2019-12-30 17:17:52 +08:00
wangmingzhe
2f0928a1a4 [FIX] 生产-修改选择产品后的跳转问题 2019-12-30 16:16:49 +08:00
zhouna
0b3dbd4ce1 Merge branch 'hotfix_证件截止与长期判断修改' into dev 2019-12-30 13:28:52 +08:00
zhouna
b7242cef8c [FIX]长期与截至日期修改 2019-12-30 13:28:24 +08:00
zhouna
7ebf109394 Merge branch 'hotfix_证件截止与长期判断修改' into dev 2019-12-30 12:43:07 +08:00
zhouna
fb2dac8181 [FIX]长期修改 2019-12-30 12:40:55 +08:00
wangmingzhe
ab960fcfeb Merge branch 'master' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-315_【1226】开门红数据报表 2019-12-30 09:11:53 +08:00
wangmingzhe
1e897e1cd5 Merge branch 'release/1226' into dev 2019-12-29 20:15:26 +08:00
wangmingzhe
da76604d23 [FIX] 修改万能险保额显示错误问题 2019-12-29 20:15:11 +08:00
wangmingzhe
9402e42759 Merge branch 'release/1226' into dev 2019-12-29 19:47:07 +08:00
wangmingzhe
580952227a [FIX] 测试注释同步万能险的保费与保额 2019-12-29 19:46:56 +08:00
wangmingzhe
fcc768319b Merge branch 'release/1226' into dev 2019-12-29 13:56:37 +08:00
wangmingzhe
2675086d64 [FIX]?? 2019-12-29 13:56:23 +08:00
wangmingzhe
4083d7408e Merge branch 'release/1226' into dev 2019-12-29 13:44:57 +08:00
wangmingzhe
04f81c2da4 [FIX] 测试 2019-12-29 13:44:36 +08:00
wangmingzhe
2480960fcb Merge branch 'release/1226' into dev 2019-12-29 13:34:14 +08:00
wangmingzhe
bc0c6e2de6 [FIX] 修改从建议书列表直接点击预览建议书问题 2019-12-29 13:34:00 +08:00
wangmingzhe
dc5a0bfed3 Merge branch 'release/1226' into dev 2019-12-29 12:46:45 +08:00
wangmingzhe
12f21f1486 [FIX] 测试 2019-12-29 12:46:30 +08:00
wangmingzhe
3f9c695579 Merge branch 'release/1226' into dev 2019-12-29 12:15:34 +08:00
wangmingzhe
b91a9a943c no message 2019-12-29 12:15:20 +08:00
wangmingzhe
790a6d1bee Merge branch 'release/1226' into dev 2019-12-29 12:10:08 +08:00
wangmingzhe
61b1a9ff61 [FIX] 修复判断问题 2019-12-29 12:09:42 +08:00
wangmingzhe
94824fcd68 Merge branch 'release/1226' into dev 2019-12-29 11:46:56 +08:00
wangmingzhe
e78aef5786 [FIX] 修复建议书预览问题 2019-12-29 11:46:07 +08:00
wangmingzhe
905c8dd195 Merge branch 'feature/GFRS-315_【1226】开门红数据报表' into dev 2019-12-27 17:46:55 +08:00
wangmingzhe
d2ec27fc0d [FIX] 修改银代数据中有null的情况显示为其他 2019-12-27 17:46:48 +08:00
wangmingzhe
9f74ca7055 Merge branch 'feature/GFRS-315_【1226】开门红数据报表' into dev 2019-12-27 17:23:18 +08:00
wangmingzhe
62c275b5fa [FIX] 修改开门红数据列表详情的显示问题 2019-12-27 17:23:09 +08:00
wangmingzhe
2bb2131d58 Merge branch 'feature/GFRS-315_【1226】开门红数据报表' into dev 2019-12-27 17:10:24 +08:00
wangmingzhe
c2ea838e31 [FIX] 修改当选择健康险时传参为团险,选择银保时传参为银代 2019-12-27 17:10:07 +08:00
zhouna
bb974c6ba7 Merge branch 'dev_1220' into release/1226 2019-12-27 16:41:31 +08:00
zhouna
edc955922a Merge branch 'dev_1220' into dev 2019-12-27 16:35:22 +08:00
zhouna
6380d76411 Merge branch 'zhouna' into dev_1220 2019-12-27 16:33:07 +08:00
zhouna
97e8dbe26e [FIX]转账空签修改 2019-12-27 16:32:47 +08:00
zhouna
ca63bc5023 Merge branch 'dev_1220' into dev 2019-12-27 16:05:11 +08:00
zhouna
42e3afedf1 Merge branch 'zhouna' into dev_1220 2019-12-27 16:04:13 +08:00
zhouna
a1f810784b [FIX]换卡空签修改 2019-12-27 16:03:41 +08:00
zhouna
0e27a247f3 Merge branch 'dev_1220' into release/1226 2019-12-27 15:43:32 +08:00
zhouna
fe1ab4da3a Merge branch 'dev_1220' into dev 2019-12-27 15:42:03 +08:00
zhouna
a6360d4d83 Merge branch 'zhouna' into dev_1220 2019-12-27 15:39:52 +08:00
zhouna
f3646a2cbc [IMP]删除console 2019-12-27 15:39:29 +08:00
zhouna
c5d5850f04 Merge branch 'dev_1220' into release/1226 2019-12-27 15:36:03 +08:00
wangmingzhe
a2ccf35480 Merge branch 'feature/GFRS-315_【1226】开门红数据报表' into dev 2019-12-27 15:31:11 +08:00