Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

public/react/src/AppConfig.js

@@ -46,7 +46,7 @@ if (isDev) {
 // 老师
 //debugType="teacher";
 // 学生
-debugType="student";
+//debugType="student";
 
 
 

public/react/src/common/components/form/City.js

@@ -542,6 +542,9 @@ const options = [{
   children: [{
     value: "南宁",
     label: '南宁'
+  },{
+    value: "来宾",
+    label: '来宾'
   },{
     value: '百色',
     label: '百色'
@@ -810,6 +813,9 @@ const options = [{
   children: [{
     value: "武汉",
     label: '武汉'
+  },{
+    value: "天门",
+    label: '天门'
   },{
     value: '恩施',
     label: '恩施'
@@ -1626,6 +1632,9 @@ const options = [{
   children: [{
     value: "杭州",
     label: '杭州'
+  },{
+    value: "温州",
+    label: '温州'
   },{
     value: '安吉',
     label: '安吉'