İşleme Grafiği

247 İşleme

Yazar SHA1 Mesaj Tarih
caixiang
ec1e5097f7 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-03 15:04:06 +08:00
b80aaee82c Merge pull request 'yanyang' (#15) from yanyang into master
Reviewed-on: #15
2023-03-03 15:02:45 +08:00
b7a3548a47 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-03 15:02:19 +08:00
333d076f6e 实际功率字段 2023-03-03 15:02:10 +08:00
caixiang
e04a4d184e Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-03 14:33:26 +08:00
caixiang
6d88aacee0 commit 2023-03-03 14:33:18 +08:00
f3b9c25a33 Merge pull request 'BaseSupportUtils' (#14) from yanyang into master
Reviewed-on: #14
2023-03-03 09:52:48 +08:00
2e72fb7df8 BaseSupportUtils 2023-03-03 09:51:54 +08:00
cf9614f857 Merge pull request 'm' (#13) from yanyang into master
Reviewed-on: #13
2023-03-03 08:16:20 +08:00
8fa7a486fd m 2023-03-02 20:05:41 +08:00
dd9cff155e Merge pull request 'yanyang' (#12) from yanyang into master
Reviewed-on: #12
2023-03-02 17:02:51 +08:00
101bc8359e Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-02 17:02:21 +08:00
e405dcb06a commonfield 2023-03-02 17:02:10 +08:00
458cedb42f Merge pull request 'yanyang' (#11) from yanyang into master
Reviewed-on: #11
2023-03-02 15:14:45 +08:00
b0c884d210 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-02 15:13:15 +08:00
3f38072356 common 2023-03-02 15:12:54 +08:00
3167ad09c4 Merge pull request 'yanyang' (#10) from yanyang into master
Reviewed-on: #10
2023-03-02 13:24:06 +08:00
df44cf308f Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-03-02 13:23:05 +08:00
57b79b4f0e f 2023-03-02 13:22:49 +08:00
caixiang
a8d3147ac9 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-01 17:06:42 +08:00
caixiang
550a2f796b commit 2023-03-01 17:06:24 +08:00
25d21ef884 Merge pull request 'feat: 🚀 添加部署master分支功能' (#9) from cicd into master
Reviewed-on: #9
2023-03-01 14:07:48 +08:00
ce721696fa feat: 🚀 添加部署master分支功能 2023-03-01 14:06:46 +08:00
caixiang
41207394e5 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-03-01 12:05:27 +08:00
caixiang
14745366be commit for pull 2023-03-01 12:05:06 +08:00
cade1cc1b9 Merge pull request 'fix' (#8) from yanyang into master
Reviewed-on: #8
2023-02-28 10:19:32 +08:00
8c0e43d9f7 fix 2023-02-28 10:19:12 +08:00
d44034c1db Merge pull request '手动装箱打印新增返回' (#7) from yanyang into master
Reviewed-on: #7
2023-02-28 09:27:31 +08:00
56b8b82fc2 手动装箱打印新增返回 2023-02-28 09:26:43 +08:00
caixiang
31bc287207 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-02-27 15:50:04 +08:00
caixiang
bb8986c98d mark 2023-02-27 15:49:58 +08:00
76cef5fc05 Merge pull request 'yanyang' (#6) from yanyang into master
Reviewed-on: #6
2023-02-27 10:59:49 +08:00
94a7b76157 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang 2023-02-27 10:58:19 +08:00
74dd845b13 m 2023-02-27 10:57:48 +08:00
58adaa3c59 打印查询 2023-02-27 10:54:22 +08:00
caixiang
fed8f82ff0 mark 2023-02-25 14:19:33 +08:00
caixiang
cdc06bd733 mark 2023-02-24 14:21:25 +08:00
caixiang
6e08ff6482 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 2023-02-24 09:11:53 +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
fa783cda84 Merge pull request 'fix' (#5) from yanyang into master
Reviewed-on: #5
2023-02-24 08:20:14 +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
2cd68b93bf Merge pull request '包装箱基板更新' (#4) from yanyang into master
Reviewed-on: #4
2023-02-23 14:25:47 +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
d853cb8409 Merge pull request 'class字段' (#3) from yanyang into master
Reviewed-on: #3
2023-02-22 20:46:42 +08:00