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/template/Sample.java

@@ -0,0 +1,30 @@
+package com.cnbm.influx.template;
+
+import com.influxdb.annotations.Column;
+import com.influxdb.annotations.Measurement;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.time.Instant;
+
+/**
+ * @Desc: "常规计量值 - entity"
+ * @Author: caixiang
+ * @DATE: 2022/6/25 11:13
+ */
+@Data
+public class Sample {
+
+    private String inspectionSheetId;
+
+    private Instant sampleTime;
+
+    private String workingProcedureName;
+
+    private String sampleNumber;
+
+    private String argName;
+
+    private String argValue;
+
+}

ym-influx/src/main/java/com/cnbm/influx/template/SampleParam.java

@@ -0,0 +1,27 @@
+package com.cnbm.influx.template;
+
+import com.influxdb.annotations.Column;
+import com.influxdb.annotations.Measurement;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.time.Instant;
+
+/**
+ * @Desc: "常规计量值 - entity"
+ * @Author: caixiang
+ * @DATE: 2022/6/25 11:13
+ */
+@Data
+public class SampleParam {
+
+    private String workingProcedureName;
+
+    //private String transationId;
+
+    private String argName;
+
+    private String argValue;
+
+}