caixiang
|
c1d37a3dbc
|
commit for pull
|
1 jaar geleden |
caixiang
|
9b545a9a03
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
# Conflicts:
# ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java
|
1 jaar geleden |
caixiang
|
c75c89cab9
|
commit for pull
|
1 jaar geleden |
闫阳
|
04e8cc187a
|
Merge pull request 'influx参数覆盖' (#16) from yanyang into master
Reviewed-on: #16
|
1 jaar geleden |
闫阳
|
add0eea2ac
|
influx参数覆盖
|
1 jaar geleden |
caixiang
|
69f911c07c
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
|
1 jaar geleden |
caixiang
|
5e8110ad2c
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
|
1 jaar geleden |
caixiang
|
7e3e028eb0
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
|
1 jaar geleden |
闫阳
|
37f0dbe548
|
Merge pull request 'yanyang' (#15) from yanyang into master
Reviewed-on: #15
|
1 jaar geleden |
闫阳
|
b501e8cd98
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
|
1 jaar geleden |
闫阳
|
98baf93cff
|
样本排序
|
1 jaar geleden |
caixiang
|
ff63c194ee
|
新增 influxdb 多条件查询
|
1 jaar geleden |
闫阳
|
1173d670e4
|
Merge pull request '时间类型修改' (#14) from yanyang into master
Reviewed-on: #14
|
1 jaar geleden |
闫阳
|
c7c43cd906
|
时间类型修改
|
1 jaar geleden |
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
|
1 jaar geleden |
caixiang
|
652812d3ba
|
commit for pull
|
1 jaar geleden |
闫阳
|
1562854e59
|
Merge pull request 'yanyang' (#13) from yanyang into master
Reviewed-on: #13
|
1 jaar geleden |
闫阳
|
d03a3e06a3
|
MARK
|
1 jaar geleden |
闫阳
|
c9d01c9e11
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
|
1 jaar geleden |
caixiang
|
de3fe9b95c
|
mark
|
1 jaar geleden |
caixiang
|
53f0c58507
|
mark
|
1 jaar geleden |
闫阳
|
95a82b042d
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
|
1 jaar geleden |
闫阳
|
b15ad64d76
|
MARK FOR PULL
|
1 jaar geleden |
caixiang
|
bf67380718
|
mark
|
1 jaar geleden |
caixiang
|
b93869c4a1
|
修改 influxdb query函数
|
1 jaar geleden |
闫阳
|
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
|
1 jaar geleden |
caixiang
|
2d9b0ea1f1
|
修改 influxdb query函数
|
1 jaar geleden |
闫阳
|
0e3f0f9168
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
|
1 jaar geleden |
闫阳
|
b515eacbab
|
MARK FOR PULL
|
1 jaar geleden |
caixiang
|
515df64760
|
修改判读方案算法
|
1 jaar geleden |
闫阳
|
ab35b10130
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
Conflicts:
ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java
ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java
ym-influx/src/main/java/com/cnbm/influx/template/Event.java
|
1 jaar geleden |
闫阳
|
4864545f12
|
m
|
1 jaar geleden |
caixiang
|
f7712f184a
|
修改判读方案算法
|
1 jaar geleden |
caixiang
|
8bfcaaf429
|
修改判读方案算法
|
1 jaar geleden |
caixiang
|
650e9a2324
|
修改判读方案算法
|
1 jaar geleden |
caixiang
|
a2d91083f2
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
|
1 jaar geleden |
caixiang
|
bd9276036b
|
mark for pull
|
1 jaar geleden |
闫阳
|
8a4f0094a1
|
Merge pull request 'm' (#12) from yanyang into master
Reviewed-on: #12
|
1 jaar geleden |
闫阳
|
1b9c3499a3
|
m
|
1 jaar geleden |
闫阳
|
e6b5583d05
|
Merge pull request '质量计划' (#11) from yanyang into master
Reviewed-on: #11
|
2 jaren geleden |
闫阳
|
a3cc4df25c
|
质量计划
|
2 jaren geleden |
闫阳
|
7abcafb93d
|
Merge pull request 'yanyang' (#10) from yanyang into master
Reviewed-on: #10
|
2 jaren geleden |
闫阳
|
559e76f6fb
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
|
2 jaren geleden |
闫阳
|
fb65441dcc
|
basic
|
2 jaren geleden |
闫阳
|
dda48c610f
|
Merge pull request 'yanyang' (#9) from yanyang into master
Reviewed-on: #9
|
2 jaren geleden |
闫阳
|
c0ce68f5b2
|
config
|
2 jaren geleden |
闫阳
|
0fb22fa625
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
Conflicts:
ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
|
2 jaren geleden |
闫阳
|
db901ef527
|
m
|
2 jaren geleden |
闫阳
|
96f9808e02
|
质量规划
|
2 jaren geleden |
caixiang
|
60b7c940fa
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
Conflicts:
ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
|
2 jaren geleden |