Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC

 Conflicts:

	ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java

ym-influx/src/main/java/com/cnbm/influx/param/QueryDataParam.java

@@ -31,5 +31,6 @@ public class QueryDataParam extends BaseParam{
     private List<String> dropedTagNames;
     private String bucket;
     private String groupName;
+    //private String inspectionSheetId;
 
 }