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

Conflicts: ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java
2022-12-09 15:31:47 +08:00
parent 652812d3ba 1562854e59
commit 1798ba8d1d
39 changed files with 1004 additions and 73 deletions
--- a/ym-influx/src/main/java/com/cnbm/influx/param/QueryDataParam.java
+++ b/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;

 }