Commit Graph

171 Commits

Author SHA1 Message Date
63f3f98ca8 mark 2022-08-09 15:19:26 +08:00
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
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
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
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
weihongyang
3a91f8b8fe vscode测试 2022-07-25 16:57:49 +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
weihongyang
0f239f7978 feat: 增加db的mysql文件的里面表的删除标识字段 2022-07-05 16:16:31 +08:00
weihongyang
e9a39ae11b fix: 🐛修改字典数据controller的bug 2022-07-05 16:05:03 +08:00
weihongyang
d3e337d622 fix: 🎨修改controller的vm模版 2022-07-05 15:25:50 +08:00
1830bb64ea test 2022-07-05 11:17:35 +08:00
f154d361a8 feat: 基础信息工具类
新增和修改时快速设置通用列
2022-07-05 10:45:06 +08:00
cd1d203d87 feat: 逻辑删除
逻辑删除实现,修改了生成器和yml
2022-07-05 10:44:09 +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