CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
202 Commits 3 Branches 0 Tags 6.6 MiB
60a46c3248
Commit Graph

202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
caixiang
bf67380718 mark 2022-12-08 16:17:15 +08:00
caixiang
b93869c4a1 修改 influxdb query函数 2022-12-08 15:28:10 +08:00
yanyang
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
yanyang
0e3f0f9168 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-12-07 11:07:41 +08:00
yanyang
b515eacbab MARK FOR PULL 2022-12-07 11:07:31 +08:00
caixiang
515df64760 修改判读方案算法 2022-12-07 11:05:27 +08:00
yanyang
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
 2022-12-01 15:54:41 +08:00
yanyang
4864545f12 m 2022-12-01 15:50:30 +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
a2d91083f2 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2022-11-25 10:12:40 +08:00
caixiang
bd9276036b mark for pull 2022-11-25 10:12:33 +08:00
闫阳
8a4f0094a1 Merge pull request 'm' (#12) from yanyang into master 
Reviewed-on: #12
 2022-11-25 10:07:32 +08:00
yanyang
1b9c3499a3 m 2022-11-25 10:06:25 +08:00
闫阳
e6b5583d05 Merge pull request '质量计划' (#11) from yanyang into master 
Reviewed-on: #11
 2022-09-30 08:56:37 +08:00
yanyang
a3cc4df25c 质量计划 2022-09-30 08:54:33 +08:00
闫阳
7abcafb93d Merge pull request 'yanyang' (#10) from yanyang into master 
Reviewed-on: #10
 2022-09-15 09:57:14 +08:00
yanyang
559e76f6fb Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-09-15 09:56:11 +08:00
yanyang
fb65441dcc basic 2022-09-15 09:55:49 +08:00
闫阳
dda48c610f Merge pull request 'yanyang' (#9) from yanyang into master 
Reviewed-on: #9
 2022-09-02 16:23:12 +08:00
yanyang
c0ce68f5b2 config 2022-09-02 16:21:20 +08:00
yanyang
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
 2022-08-23 15:13:13 +08:00
yanyang
db901ef527 m 2022-08-23 15:12:46 +08:00
yanyang
96f9808e02 质量规划 2022-08-23 15:02:24 +08:00
caixiang
60b7c940fa Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 
 Conflicts:
	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
 2022-08-23 14:47:23 +08:00
caixiang
0b4f717fa8 mark for pull 2022-08-23 14:46:51 +08:00
闫阳
aa41bf403d Merge pull request 'yanyang' (#8) from yanyang into master 
Reviewed-on: #8
 2022-08-09 15:25:36 +08:00
yanyang
848eb60f43 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 2022-08-09 15:22:31 +08:00
yanyang
d9c13516cb mark 2022-08-09 15:22:21 +08:00
yanyang
63f3f98ca8 mark 2022-08-09 15:19:26 +08:00
yanyang
16a52e69c8 mark 2022-08-09 15:16:12 +08:00
caixiang
d22b778b8a Merge branch 'master' of http://git.picaiba.com/kszny/ym-pass 
 Conflicts:
	ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java
	ym-gateway/src/main/resources/application.yml
	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
 2022-08-09 14:58:48 +08:00
caixiang
61dbaf92e1 Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC 2022-08-09 14:58:05 +08:00
caixiang
01c95bfe1d mark for pull 2022-08-09 14:57:55 +08:00
weihongyang
f5988be736 ✨ feat:新增退出功能 2022-08-09 14:21:05 +08:00
weihongyang
78fa6f42b0 🐛 fix:修复序列化问题 2022-08-09 11:05:44 +08:00
weihongyang
030abafd1f fix: 🐛修改分页不生效问题 2022-08-08 16:36:53 +08:00
weihongyang
16e656d820 feat: 增加操作日志的操作人和操作时间 2022-08-08 10:01:52 +08:00
weihongyang
c0f460e1e4 feat: 增加登录日志接口 2022-08-08 09:53:41 +08:00
闫阳
b1a9c6e77c Merge pull request 'jh' (#7) from yanyang into master 
Reviewed-on: #7
 2022-08-05 16:48:33 +08:00
yanyang
73efee55e7 jh 2022-08-05 16:46:33 +08:00
闫阳
959b1a0b77 Merge pull request 'mapper' (#6) from yanyang into master 
Reviewed-on: #6
 2022-08-03 16:54:20 +08:00
yanyang
ba88da6982 mapper 2022-08-03 16:53:24 +08:00
闫阳
314380cd74 Merge pull request 'yanyang' (#5) from yanyang into master 
Reviewed-on: #5
 2022-08-01 13:54:40 +08:00
yanyang
1b01150a7e Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang 
 Conflicts:
	ym-baisc/src/main/java/com/cnbm/basic/controller/ProductController.java
 2022-08-01 13:44:25 +08:00
yanyang
e9e0c47536 mark 2022-08-01 13:44:01 +08:00
caixiang
0750c9583e mark 2022-08-01 13:42:54 +08:00
caixiang
e9c8f7857b 新增：XMR 控制图 2022-07-29 16:56:35 +08:00