Commit Graph

13 Commits

Author SHA1 Message Date
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
bac1ec5b70 数据库字段更改 2022-07-29 14:19:35 +08:00
f44f701dad status 2022-07-21 09:47:38 +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
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
4c2e20bf0d 删掉了 ,spc不需要的模块 2022-06-30 15:28:19 +08:00
caixiang
5d631e77c2 mark 2022-06-22 10:23:56 +08:00