Merge branch 'channel' into hotfix_channel

@@ -94,6 +94,7 @@ public class ChannelGroupServiceImpl implements IChannelGroupService {
     }};
 
     public final static Map channelSourceMap = new HashedMap() {{
+        put("0", "无来源");
         put("5", "淘宝B店订单");
         put("8", "淘宝C店订单");
         put("9", "淘宝LAL店订单");

@@ -25,6 +25,7 @@
 		textField: 'text',
 		prompt:'选择泛渠道来源',
 		data: [
+            { id: '0', text: '无来源' },
             { id: '5', text: '淘宝B店订单' },
             { id: '8', text: '淘宝C店订单' },
             { id: '9', text: '淘宝LAL店订单' },