Commit Graph

Select branches

Hide Pull Requests

cicd

dynamicDs

master

yanyang

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#5

#6

#7

#8

#9

Mono Color

• e9e73df74d Merge pull request '模组查询包装箱 时间' (#17) from yanyang into master 闫阳 2023-03-06 17:04:06 +0800
• 4fd5498f1e 模组查询包装箱 时间 yanyang 2023-03-06 17:03:01 +0800
• 5b3f6f6f5d Merge pull request 'yanyang' (#16) from yanyang into master 闫阳 2023-03-06 11:56:43 +0800
• cd1bfc3287 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang yanyang 2023-03-06 11:55:29 +0800
• bf0d6108a1 导出 yanyang 2023-03-06 11:50:59 +0800
• 05684b5d2a 新增功率档位 统计报表 caixiang 2023-03-06 11:24:16 +0800
• 9ccc971a38 mark caixiang 2023-03-04 13:57:07 +0800
• ec1e5097f7 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-03-03 15:04:06 +0800
• b80aaee82c Merge pull request 'yanyang' (#15) from yanyang into master 闫阳 2023-03-03 15:02:45 +0800
• b7a3548a47 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang yanyang 2023-03-03 15:02:19 +0800
• 333d076f6e 实际功率字段 yanyang 2023-03-03 15:02:10 +0800
• e04a4d184e Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-03-03 14:33:26 +0800
• 6d88aacee0 commit caixiang 2023-03-03 14:33:18 +0800
• f3b9c25a33 Merge pull request 'BaseSupportUtils' (#14) from yanyang into master 闫阳 2023-03-03 09:52:48 +0800
• 2e72fb7df8 BaseSupportUtils yanyang 2023-03-03 09:51:54 +0800
• cf9614f857 Merge pull request 'm' (#13) from yanyang into master 闫阳 2023-03-03 08:16:20 +0800
• 8fa7a486fd m yanyang 2023-03-02 20:05:41 +0800
• dd9cff155e Merge pull request 'yanyang' (#12) from yanyang into master 闫阳 2023-03-02 17:02:51 +0800
• 101bc8359e Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang yanyang 2023-03-02 17:02:21 +0800
• e405dcb06a commonfield yanyang 2023-03-02 17:02:10 +0800
• 458cedb42f Merge pull request 'yanyang' (#11) from yanyang into master 闫阳 2023-03-02 15:14:45 +0800
• b0c884d210 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang yanyang 2023-03-02 15:13:15 +0800
• 3f38072356 common yanyang 2023-03-02 15:12:54 +0800
• 3167ad09c4 Merge pull request 'yanyang' (#10) from yanyang into master 闫阳 2023-03-02 13:24:06 +0800
• df44cf308f Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang yanyang 2023-03-02 13:23:05 +0800
• 57b79b4f0e f yanyang 2023-03-02 13:22:49 +0800
• a8d3147ac9 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-03-01 17:06:42 +0800
• 550a2f796b commit caixiang 2023-03-01 17:06:24 +0800
• 25d21ef884 Merge pull request 'feat: 🚀 添加部署master分支功能' (#9) from cicd into master 施海荣 2023-03-01 14:07:48 +0800
• ce721696fa feat: 🚀 添加部署master分支功能 cicd thomas 2023-03-01 14:06:46 +0800
• 41207394e5 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-03-01 12:05:27 +0800
• 14745366be commit for pull caixiang 2023-03-01 12:05:06 +0800
• cade1cc1b9 Merge pull request 'fix' (#8) from yanyang into master 闫阳 2023-02-28 10:19:32 +0800
• 8c0e43d9f7 fix yanyang 2023-02-28 10:19:12 +0800
• d44034c1db Merge pull request '手动装箱打印新增返回' (#7) from yanyang into master 闫阳 2023-02-28 09:27:31 +0800
• 56b8b82fc2 手动装箱打印新增返回 yanyang 2023-02-28 09:26:43 +0800
• 31bc287207 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-02-27 15:50:04 +0800
• bb8986c98d mark caixiang 2023-02-27 15:49:58 +0800
• 76cef5fc05 Merge pull request 'yanyang' (#6) from yanyang into master 闫阳 2023-02-27 10:59:49 +0800
• 94a7b76157 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang yanyang 2023-02-27 10:58:19 +0800
• 74dd845b13 m yanyang 2023-02-27 10:57:48 +0800
• 58adaa3c59 打印查询 yanyang 2023-02-27 10:54:22 +0800
• fed8f82ff0 mark caixiang 2023-02-25 14:19:33 +0800
• cdc06bd733 mark caixiang 2023-02-24 14:21:25 +0800
• 6e08ff6482 Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-02-24 09:11:53 +0800
• a50849affc mark caixiang 2023-02-24 09:11:23 +0800
• 161b5b5be4 Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-02-24 08:47:56 +0800
• 6d3b1e9cbb commit for pull caixiang 2023-02-24 08:46:36 +0800
• fa783cda84 Merge pull request 'fix' (#5) from yanyang into master 闫阳 2023-02-24 08:20:14 +0800
• e8629b9ced fix yanyang 2023-02-23 18:51:03 +0800
• 384b1a3d54 Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-02-23 14:28:24 +0800
• 16f3cd5d30 commit for pull caixiang 2023-02-23 14:28:05 +0800
• 2cd68b93bf Merge pull request '包装箱基板更新' (#4) from yanyang into master 闫阳 2023-02-23 14:25:47 +0800
• 5f409dfdf7 包装箱基板更新 yanyang 2023-02-23 14:24:29 +0800
• 1ebe39b60a Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-02-22 20:49:04 +0800
• 4d1a58b8c7 commit for pull caixiang 2023-02-22 20:48:15 +0800
• d853cb8409 Merge pull request 'class字段' (#3) from yanyang into master 闫阳 2023-02-22 20:46:42 +0800
• 7a6fffbf21 class字段 yanyang 2023-02-22 20:45:54 +0800
• de085053b8 Merge pull request 'yanyang' (#2) from yanyang into master 闫阳 2023-02-22 16:17:03 +0800
• d518ce3d19 Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang yanyang 2023-02-22 16:14:54 +0800
• ff4bfe3a8b m yanyang 2023-02-22 16:13:08 +0800
• 4535677c93 Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4 caixiang 2023-02-22 16:01:21 +0800
• 1d8aff98c7 包装 yanyang 2023-02-22 15:59:13 +0800
• 91c9602fb7 initial caixiang 2023-02-15 14:06:31 +0800
• 1610c6bf8e docs 📝 readme中补充多数据源配置指南 dynamicDs thomas 2023-02-15 10:01:35 +0800
• 971b91329f feat: 🆕 新增多数据源功能 thomas 2023-02-14 16:53:25 +0800
• 8f3da0bf2e initial caixiang 2023-02-14 10:32:22 +0800
• 9d75942afb initial caixiang 2023-02-14 09:08:21 +0800
• e0a947f050 codeGenerator修改 LGH 2022-11-08 13:58:23 +0800
• 9c649ccdcd codeGenerator修改 LGH 2022-11-08 13:54:59 +0800
• 88d29c0260 Merge branch 'master' of http://git.picaiba.com/why/ym LGH 2022-11-07 17:14:52 +0800
• 6cb64ca442 codeGenerator修改 LGH 2022-11-07 17:14:15 +0800
• 711a4f839b fix: 修正.dorne.yml文件格式 thomas 2022-09-15 10:48:36 +0800
• 23eb91fa4a Merge pull request 'build: 💚 增加docker分层构建，自动发布功能' (#2) from cicd into master 施海荣 2022-09-15 09:22:47 +0800
• 18e950cda7 build: 💚 增加docker分层构建，自动发布功能 thomas 2022-09-15 09:15:54 +0800
• 76ad4ac04b feat: 配置打包build why 2022-09-14 10:59:50 +0800
• f2091d56e2 init weihongyang 2022-09-13 13:04:55 +0800
• fcf35bd12b 📝 fix: 修改excel和core配置 weihongyang 2022-08-18 10:34:23 +0800
• bf24b8a7e5 🎨 fix: 修改注释 weihongyang 2022-08-15 14:20:27 +0800
• c02c6cab10 🚑 feat:实体类增加删除标识 weihongyang 2022-08-10 08:49:11 +0800
• e644d027b2 🐛 fix:修改序列化 weihongyang 2022-08-09 16:10:18 +0800
• f5988be736 ✨ feat:新增退出功能 weihongyang 2022-08-09 14:21:05 +0800
• 78fa6f42b0 🐛 fix:修复序列化问题 weihongyang 2022-08-09 11:05:44 +0800
• 030abafd1f fix: 🐛修改分页不生效问题 weihongyang 2022-08-08 16:36:53 +0800
• 16e656d820 feat: 增加操作日志的操作人和操作时间 weihongyang 2022-08-08 10:01:52 +0800
• c0f460e1e4 feat: 增加登录日志接口 weihongyang 2022-08-08 09:53:41 +0800
• 3a91f8b8fe ✅ vscode测试 weihongyang 2022-07-25 16:57:49 +0800
• 0f239f7978 feat: 增加db的mysql文件的里面表的删除标识字段 weihongyang 2022-07-05 16:16:31 +0800
• e9a39ae11b fix: 🐛修改字典数据controller的bug weihongyang 2022-07-05 16:05:03 +0800
• d3e337d622 fix: 🎨修改controller的vm模版 weihongyang 2022-07-05 15:25:50 +0800
• f154d361a8 feat: 基础信息工具类 Lin-XCC 2022-07-05 10:45:06 +0800
• cd1d203d87 feat: 逻辑删除 Lin-XCC 2022-07-05 10:44:09 +0800
• 1f85905317 feat: 📝新增README文档 weihongyang 2022-07-01 14:49:50 +0800
• ccedf0ab5c fix: 🐛修改mapper xml的模板 weihongyang 2022-06-30 16:28:28 +0800
• e4bfce9df3 fix: 🔧 weihongyang 2022-06-30 08:40:59 +0800
• 3a090fb584 feat: 添加websocket模块之后maven必要添加 weihongyang 2022-06-29 16:33:10 +0800
• e277f2a32e feat: 给websocket的请求放行 weihongyang 2022-06-29 16:32:20 +0800
• 6d792317dd feat: init websocket模块 weihongyang 2022-06-29 16:29:25 +0800
• 8d6cda8f90 feat: 新增maven依赖 weihongyang 2022-06-29 16:28:20 +0800
• fdf870c779 fix: 修改定时任务的log日志 weihongyang 2022-06-29 16:27:40 +0800