Merge remote-tracking branch 'origin/zhangxueyang' into zyy

解决冲突
# Conflicts:
#	XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -5103,7 +5103,7 @@ namespace XHWK.WKTool
             //if (bPenStatus == 17)
             //{
             //}
-            //if(APP.IsOutputInfoLog)
+            //if (APP.IsOutputInfoLog)
             //{
             //    LogHelper.WriteInfoLog(string.Format(@"x={0},y={1},s={2},p={3}", bx, by, bPenStatus, bPress));
             //}