Merge branch 'master' into 'github'

# Conflicts:
#   lives/index.yml

lives/2020-11-18/day.yml

@@ -43,16 +43,6 @@ items:
     supporters:
     - url: 'https://codechina.csdn.net/uploads/-/system/group/avatar/122/5485517.png?width=72'
       link: 'https://codechina.csdn.net/dcloud'
-#5 众邦科技    
-  - start_time: '12:00'
-    end_time: '12:30'
-    title: '赋能开发者，提升企业数字化'
-    namespace_path: 'xazbkj'
-    description: '如今电商开始被所有企业重视，很多人都意识到经营自己私域流量的重要性，虽然目前有很多saas平台，但是很多企业还是希望拥有自己独立的电商系统，我们精力有限不能帮助更多企业搭建，所以我们开源推出一款常用的客户管理加电商，赋能更多开发者，帮助更多企业低成本快速拥有自己的电商系统。'
-    live_link: 'https://live.csdn.net/room-iframe/crmeb/LVhDxrK2'
-    supporters:
-    - url: 'https://codechina.csdn.net/uploads/-/system/group/avatar/30711/logo.png?width=72'
-      link: 'https://codechina.csdn.net/xazbkj'
 #6 字节跳动   
   - start_time: '12:30'
     end_time: '13:00'
@@ -63,16 +53,6 @@ items:
     supporters:
     - url: 'https://codechina.csdn.net/uploads/-/system/group/avatar/33609/4158466.png?width=72'
       link: 'https://codechina.csdn.net/bytedance-inc'
-#7 滴滴夜莺
-  - start_time: '13:00'
-    end_time: '13:30'
-    title: '一站式运维监控平台夜莺分享'
-    description: '介绍滴滴夜莺的产品'
-    namespace_path: 'didi'
-    live_link: 'https://live.csdn.net/room-iframe/morflame/j9C1QyPR'
-    supporters:
-    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/136de6d1550de127ee81b3a8a9111e28/nightingale-didi.png'
-      link: 'https://codechina.csdn.net/didi1'
 #9 RT-Thread
   - start_time: '13:30'
     end_time: '14:00'
@@ -213,6 +193,26 @@ items:
     supporters:
     - url: 'https://codechina.csdn.net/uploads/-/system/group/avatar/33694/29125077.jpg?width=72'
       link: 'https://codechina.csdn.net/oaid'
+#5 众邦科技    
+  - start_time: '20:30'
+    end_time: '21:00'
+    title: 'CRMEB开源系统，赋能开发者，提速企业数字化'
+    namespace_path: 'xazbkj'
+    description: '如今电商开始被所有企业重视，很多人都意识到经营自己私域流量的重要性，虽然目前有很多saas平台，但是很多企业还是希望拥有自己独立的电商系统，我们精力有限不能帮助更多企业搭建，所以我们开源推出一款常用的客户管理加电商，赋能更多开发者，帮助更多企业低成本快速拥有自己的电商系统。'
+    live_link: 'https://live.csdn.net/room-iframe/unqvkk37f0jjs/wyRquPv8'
+    supporters:
+    - url: 'https://codechina.csdn.net/uploads/-/system/project/avatar/7653/fanglogo.jpg?width=90'
+      link: 'https://codechina.csdn.net/xazbkj'
+#7 滴滴夜莺
+  - start_time: '21:00'
+    end_time: '21:30'
+    title: '一站式运维监控平台夜莺分享'
+    description: '介绍滴滴夜莺的产品'
+    namespace_path: 'didi'
+    live_link: 'https://live.csdn.net/room-iframe/morflame/UKQMrsRD'
+    supporters:
+    - url: 'https://codechina.csdn.net/codechina/operation-work/uploads/136de6d1550de127ee81b3a8a9111e28/nightingale-didi.png'
+      link: 'https://codechina.csdn.net/didi1'
 relations:
 #  - url: ''
 #    timestamp: '2020-11-13'