Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

VisualInspection/js/teamClass/charge_team_schedule.js

@@ -347,7 +347,7 @@
             var end_time = $("#end_time").val() ;
             var name = $("#team_info_ti").find("option:selected").text(); 
             
-            if(start_time >= end_time){
+            if(start_time >end_time){
                 tip("时间设置不合理，开始时间不能大于结束时间");
                 return ;
             }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/UserInfoMapper.xml

@@ -55,6 +55,7 @@
         SET
         <if test="username != null">username = #{username},</if>
         <if test="truename != null">truename = #{truename},</if>
+        <if test="organid != null">organid = #{organid},</if>
         <if test="age != null">age = #{age},</if>
         <if test="password != null">password = #{password},</if>
         <if test="pic != null">pic = #{pic},</if>