caixiang
|
01c95bfe1d
|
mark for pull
|
2022-08-09 14:57:55 +08:00 |
|
|
|
314380cd74
|
Merge pull request 'yanyang' (#5) from yanyang into master
Reviewed-on: #5
|
2022-08-01 13:54:40 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
caixiang
|
227a27295d
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
|
2022-07-29 14:23:19 +08:00 |
|
caixiang
|
2d1ef3d743
|
mark for pull
|
2022-07-29 14:23:13 +08:00 |
|
|
|
46b6e5e66e
|
Merge pull request '数据库字段更改' (#4) from yanyang into master
Reviewed-on: #4
|
2022-07-29 14:22:20 +08:00 |
|
|
|
bac1ec5b70
|
数据库字段更改
|
2022-07-29 14:19:35 +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
|
1477d05a69
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
Conflicts:
ym-baisc/src/main/java/com/cnbm/basic/controller/FactoryController.java
ym-influx/src/main/java/com/cnbm/influx/Main.java
|
2022-07-21 09:50:48 +08:00 |
|
caixiang
|
f498afd856
|
mark for pull
|
2022-07-21 09:50:01 +08:00 |
|
|
|
4cfd541f06
|
Merge pull request 'status' (#3) from yanyang into master
Reviewed-on: #3
|
2022-07-21 09:49:21 +08:00 |
|
|
|
297d5f04ea
|
Merge branch 'master' into yanyang
|
2022-07-21 09:49:17 +08:00 |
|
|
|
f44f701dad
|
status
|
2022-07-21 09:47:38 +08:00 |
|
|
|
c3460f6dc4
|
Merge pull request 'yanyang' (#2) from yanyang into master
Reviewed-on: #2
|
2022-07-20 15:58:37 +08:00 |
|
caixiang
|
23b5ce90c9
|
Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/SPC
|
2022-07-20 15:33:46 +08:00 |
|
caixiang
|
2b34011129
|
mark for pull
|
2022-07-20 15:33:30 +08:00 |
|
|
|
3a77498965
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC into yanyang
Conflicts:
ym-baisc/src/main/java/com/cnbm/basic/mapper/ProductTypeMapper.java
|
2022-07-20 15:30:30 +08:00 |
|
|
|
3bd383a347
|
mark
|
2022-07-20 15:29:54 +08:00 |
|
|
|
718ad8a8c2
|
product_features表
|
2022-07-20 15:14:39 +08:00 |
|
caixiang
|
13020d05c9
|
新增判读方案
|
2022-07-15 17:15:42 +08:00 |
|
caixiang
|
970359823b
|
新增判读方案
|
2022-07-13 16:41:43 +08:00 |
|
|
|
1830bb64ea
|
test
|
2022-07-05 11:17:35 +08:00 |
|
|
|
0dc10a669f
|
test
|
2022-07-05 09:52:58 +08:00 |
|
caixiang
|
facfe5c7a2
|
Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC
|
2022-07-04 14:49:53 +08:00 |
|
caixiang
|
d3500d195b
|
mark for influx
|
2022-07-04 14:49:49 +08:00 |
|
weihongyang
|
8159ffc509
|
feat: 🔧 新增swagger配置让swagger和actuator无冲突
|
2022-07-04 09:54:08 +08:00 |
|
caixiang
|
e5def9fb33
|
mark
|
2022-07-04 08:32:21 +08:00 |
|
caixiang
|
4c2e20bf0d
|
删掉了 ，spc不需要的模块
|
2022-06-30 15:28:19 +08:00 |
|
caixiang
|
c15c0e1f1c
|
Merge branch 'master' of http://git.picaiba.com/why/ym
Conflicts:
pom.xml
ym-gateway/src/main/java/com/cnbm/config/SwaggerConfig.java
ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
|
2022-06-30 11:49:31 +08:00 |
|
weihongyang
|
e4bfce9df3
|
fix: 🔧
|
2022-06-30 08:40:59 +08:00 |
|
weihongyang
|
3a090fb584
|
feat: 添加websocket模块之后maven必要添加
|
2022-06-29 16:33:10 +08:00 |
|
weihongyang
|
e277f2a32e
|
feat: 给websocket的请求放行
|
2022-06-29 16:32:20 +08:00 |
|
weihongyang
|
6d792317dd
|
feat: init websocket模块
|
2022-06-29 16:29:25 +08:00 |
|
weihongyang
|
8d6cda8f90
|
feat: 新增maven依赖
|
2022-06-29 16:28:20 +08:00 |
|
weihongyang
|
fdf870c779
|
fix: 修改定时任务的log日志
|
2022-06-29 16:27:40 +08:00 |
|
weihongyang
|
4712d0300a
|
fix: 修改redis的数据库
|
2022-06-29 16:27:00 +08:00 |
|
weihongyang
|
58c998afb0
|
feat: 增加定时定任务功能的xml文件
|
2022-06-24 16:07:31 +08:00 |
|
weihongyang
|
26fee6ac1c
|
feat: 增加定时定任务模块pom配置
|
2022-06-24 10:27:11 +08:00 |
|
weihongyang
|
92a8e17f6e
|
feat: 增加test的yaml文件
|
2022-06-24 10:25:36 +08:00 |
|
weihongyang
|
645bafc280
|
feat: init定时任务
|
2022-06-24 10:25:17 +08:00 |
|
weihongyang
|
1ac94e3d4c
|
fix: 修改全局异常处理
|
2022-06-23 16:00:43 +08:00 |
|
weihongyang
|
093d6ee362
|
feat: sercurity的配置文件新增加LogoutHandler的实现类 在LogoutFilter之前加入jwtAuthenticationTokenFilter
|
2022-06-23 15:39:49 +08:00 |
|
weihongyang
|
aab0ea4479
|
fix: 修改验证码uuid参数默认是string
|
2022-06-23 15:31:55 +08:00 |
|
weihongyang
|
d3322639de
|
fix: 修改swagger配置增加了新的组
|
2022-06-23 14:21:44 +08:00 |
|
