Commit Graph

26 Commits

Author SHA1 Message Date
caixiang
1798ba8d1d 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
caixiang
652812d3ba commit for pull 2022-12-09 15:31:32 +08:00
c9d01c9e11 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-12-09 09:08:12 +08:00
caixiang
53f0c58507 mark 2022-12-08 17:21:28 +08:00
95a82b042d Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-12-08 16:26:28 +08:00
b15ad64d76 MARK FOR PULL 2022-12-08 16:26:17 +08:00
caixiang
bf67380718 mark 2022-12-08 16:17:15 +08:00
caixiang
b93869c4a1 修改 influxdb query函数 2022-12-08 15:28:10 +08:00
6829169a4a Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
 Conflicts:
	ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java
2022-12-07 16:58:35 +08:00
caixiang
2d9b0ea1f1 修改 influxdb query函数 2022-12-07 16:56:47 +08:00
b515eacbab MARK FOR PULL 2022-12-07 11:07:31 +08:00
caixiang
f7712f184a 修改判读方案算法 2022-12-01 15:33:57 +08:00
caixiang
8bfcaaf429 修改判读方案算法 2022-12-01 11:45:05 +08:00
caixiang
650e9a2324 修改判读方案算法 2022-11-29 11:11:07 +08:00
caixiang
bd9276036b mark for pull 2022-11-25 10:12:33 +08:00
caixiang
01c95bfe1d mark for pull 2022-08-09 14:57:55 +08:00
caixiang
0750c9583e mark 2022-08-01 13:42:54 +08:00
caixiang
8a3a037bda mark 2022-07-29 10:38:43 +08:00
caixiang
e7a542d386 新增 MR MS 控制图 2022-07-29 10:28:14 +08:00
caixiang
fde6a8b684 mark 2022-07-27 20:04:38 +08:00
caixiang
d26600892f mark 2022-07-25 16:58:55 +08:00
caixiang
f498afd856 mark for pull 2022-07-21 09:50:01 +08:00
caixiang
2b34011129 mark for pull 2022-07-20 15:33:30 +08:00
caixiang
970359823b 新增判读方案 2022-07-13 16:41:43 +08:00
caixiang
d3500d195b mark for influx 2022-07-04 14:49:49 +08:00
caixiang
e5def9fb33 mark 2022-07-04 08:32:21 +08:00