Commit Graph

128 Commits

Author SHA1 Message Date
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
7a6fffbf21 class字段 2023-02-22 20:45:54 +08:00
de085053b8 Merge pull request 'yanyang' (#2) from yanyang into master
Reviewed-on: #2
2023-02-22 16:17:03 +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
caixiang
4535677c93 Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4
# Conflicts:
#	ym-packing/pom.xml
2023-02-22 16:01:21 +08:00
1d8aff98c7 包装 2023-02-22 15:59:13 +08:00
caixiang
91c9602fb7 initial 2023-02-15 14:06:31 +08:00
971b91329f feat: 🆕 新增多数据源功能 2023-02-14 16:53:25 +08:00
caixiang
8f3da0bf2e initial 2023-02-14 10:32:22 +08:00
caixiang
9d75942afb initial 2023-02-14 09:08:21 +08:00
LGH
e0a947f050 codeGenerator修改 2022-11-08 13:58:23 +08:00
LGH
9c649ccdcd codeGenerator修改 2022-11-08 13:54:59 +08:00
LGH
88d29c0260 Merge branch 'master' of http://git.picaiba.com/why/ym
 Conflicts:
	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
2022-11-07 17:14:52 +08:00
LGH
6cb64ca442 codeGenerator修改 2022-11-07 17:14:15 +08:00
711a4f839b fix: 修正.dorne.yml文件格式 2022-09-15 10:48:36 +08:00
23eb91fa4a Merge pull request 'build: 💚 增加docker分层构建,自动发布功能' (#2) from cicd into master
Reviewed-on: kszny/ym-pass#2
2022-09-15 09:22:47 +08:00
18e950cda7 build: 💚 增加docker分层构建,自动发布功能 2022-09-15 09:15:54 +08:00
why
76ad4ac04b feat: 配置打包build 2022-09-14 10:59:50 +08:00
weihongyang
f2091d56e2 init 2022-09-13 13:04:55 +08:00