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

* 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection:
  dd
  dd
  sss

# Conflicts:
#	VisualInspection_server/visual/visual.log
#	Visuallnspection_fjq/visuallnspectioninteface/.idea/workspace.xml
dd

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -118,9 +118,9 @@
         <if test="start_date!=null and end_date != null">
             AND ct.start_time &gt;= #{start_date} AND ct.end_time &lt; #{end_date}
         </if>
-        <if test="dept_id!=null">
-            AND ct.checked_dept =#{dept_id}
-        </if>
+        <!--<if test="dept_id!=null">-->
+            <!--AND ct.checked_dept =#{dept_id}-->
+        <!--</if>-->
         )
         u GROUP BY checked_person
         ) m ON t.user_id = m.user_id