Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

# Conflicts:
#	.idea/workspace.xml
#	applications/wechat/wechat-api/wechat-api.iml
#	applications/wechat/wechat-server/wechat-server.iml
#	frontend/wechat-web/src/configs/api.config.js

frontend/wechat-web/src/modules/hiPages/send-vote/SendVote.js

@@ -4,7 +4,7 @@
 
 import React, {Component} from 'react';
 import nextArrowimg from '../../../style/imgs/next_arrow.png';
-import './SendMeet.css';
+import './SendVote.css';
 import 'antd/dist/antd.css';
 import {Select, TreeSelect, Icon, Button} from 'antd';
 import moment from 'moment';