Merge branch 'master' of http://139.159.178.92:8090/zhenglide/UbainsMeeting

# Conflicts:
#	app.js

app.js

@@ -14,7 +14,6 @@ App({
   //全局数据
   globalData: {
     //domain:'http://id24iu.natappfree.cc',
-   //domain: "http://zhenglide.natapp1.cc" ,
     domain:"http://dd2.ubainsyun.com",
     corpId: '',
     userId:'',