Commit Graph

206 Commits

Author SHA1 Message Date
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
weihongyang
fcf35bd12b 📝 fix: 修改excel和core配置 2022-08-18 10:34:23 +08:00
weihongyang
bf24b8a7e5 🎨 fix: 修改注释 2022-08-15 14:20:27 +08:00
weihongyang
c02c6cab10 🚑 feat:实体类增加删除标识 2022-08-10 08:49:11 +08:00
weihongyang
e644d027b2 🐛 fix:修改序列化 2022-08-09 16:10:18 +08:00
weihongyang
f5988be736 feat:新增退出功能 2022-08-09 14:21:05 +08:00
weihongyang
78fa6f42b0 🐛 fix:修复序列化问题 2022-08-09 11:05:44 +08:00
weihongyang
030abafd1f fix: 🐛修改分页不生效问题 2022-08-08 16:36:53 +08:00
weihongyang
16e656d820 feat: 增加操作日志的操作人和操作时间 2022-08-08 10:01:52 +08:00
weihongyang
c0f460e1e4 feat: 增加登录日志接口 2022-08-08 09:53:41 +08:00
weihongyang
3a91f8b8fe vscode测试 2022-07-25 16:57:49 +08:00
weihongyang
0f239f7978 feat: 增加db的mysql文件的里面表的删除标识字段 2022-07-05 16:16:31 +08:00
weihongyang
e9a39ae11b fix: 🐛修改字典数据controller的bug 2022-07-05 16:05:03 +08:00
weihongyang
d3e337d622 fix: 🎨修改controller的vm模版 2022-07-05 15:25:50 +08:00
f154d361a8 feat: 基础信息工具类
新增和修改时快速设置通用列
2022-07-05 10:45:06 +08:00
cd1d203d87 feat: 逻辑删除
逻辑删除实现,修改了生成器和yml
2022-07-05 10:44:09 +08:00
weihongyang
1f85905317 feat: 📝新增README文档 2022-07-01 14:49:50 +08:00
weihongyang
ccedf0ab5c fix: 🐛修改mapper xml的模板 2022-06-30 16:28:28 +08:00
weihongyang
e4bfce9df3 fix: 🔧 2022-06-30 08:40:59 +08:00
weihongyang
3a090fb584 feat: 添加websocket模块之后maven必要添加 2022-06-29 16:33:10 +08:00
weihongyang
e277f2a32e feat: 给websocket的请求放行 2022-06-29 16:32:20 +08:00
weihongyang
6d792317dd feat: init websocket模块 2022-06-29 16:29:25 +08:00
weihongyang
8d6cda8f90 feat: 新增maven依赖 2022-06-29 16:28:20 +08:00