Commit Graph

16 Commits

Author SHA1 Message Date
caixiang
cdc06bd733 mark 2023-02-24 14:21:25 +08:00
caixiang
a50849affc mark 2023-02-24 09:11:23 +08:00
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
caixiang
6d3b1e9cbb commit for pull 2023-02-24 08:46:36 +08:00
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
5f409dfdf7 包装箱基板更新 2023-02-23 14:24:29 +08:00
caixiang
1ebe39b60a Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4
# Conflicts:
#	ym-packing/pom.xml
2023-02-22 20:49:04 +08:00
caixiang
4d1a58b8c7 commit for pull 2023-02-22 20:48:15 +08:00
7a6fffbf21 class字段 2023-02-22 20:45:54 +08:00
d518ce3d19 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang
 Conflicts:
	ym-packing/pom.xml
2023-02-22 16:14:54 +08:00
ff4bfe3a8b m 2023-02-22 16:13:08 +08:00
1d8aff98c7 包装 2023-02-22 15:59:13 +08:00
caixiang
91c9602fb7 initial 2023-02-15 14:06:31 +08:00
caixiang
9d75942afb initial 2023-02-14 09:08:21 +08:00