Authored by LiQZ

Merge branch 'channel' into hotfix_channel

@@ -94,6 +94,7 @@ public class ChannelGroupServiceImpl implements IChannelGroupService { @@ -94,6 +94,7 @@ public class ChannelGroupServiceImpl implements IChannelGroupService {
94 }}; 94 }};
95 95
96 public final static Map channelSourceMap = new HashedMap() {{ 96 public final static Map channelSourceMap = new HashedMap() {{
  97 + put("0", "无来源");
97 put("5", "淘宝B店订单"); 98 put("5", "淘宝B店订单");
98 put("8", "淘宝C店订单"); 99 put("8", "淘宝C店订单");
99 put("9", "淘宝LAL店订单"); 100 put("9", "淘宝LAL店订单");
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
25 textField: 'text', 25 textField: 'text',
26 prompt:'选择泛渠道来源', 26 prompt:'选择泛渠道来源',
27 data: [ 27 data: [
  28 + { id: '0', text: '无来源' },
28 { id: '5', text: '淘宝B店订单' }, 29 { id: '5', text: '淘宝B店订单' },
29 { id: '8', text: '淘宝C店订单' }, 30 { id: '8', text: '淘宝C店订单' },
30 { id: '9', text: '淘宝LAL店订单' }, 31 { id: '9', text: '淘宝LAL店订单' },