6 Commits

Author	SHA1	Message	Date
caixiang	161b5b5be4	Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4 ... # Conflicts: # ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java # ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java # ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java	2023-02-24 08:47:56 +08:00
yanyang	e8629b9ced	fix	2023-02-23 18:51:03 +08:00
caixiang	384b1a3d54	Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4	2023-02-23 14:28:24 +08:00
caixiang	16f3cd5d30	commit for pull	2023-02-23 14:28:05 +08:00
yanyang	5f409dfdf7	包装箱基板更新	2023-02-23 14:24:29 +08:00
yanyang	1d8aff98c7	包装	2023-02-22 15:59:13 +08:00