Commit Graph

Select branches

Hide Pull Requests

dev_js_20260309

dev_js_20260317

dev_js_20260323

dpx20260211

liug

main_hhl0209

master

#20

#21

#22

#23

#24

#25

Mono Color

• affe6bfed5 分组SQL调整 king 2026-03-10 16:52:34 +08:00
• 8523b80eb3 分组SQL调整 king 2026-03-10 15:38:16 +08:00
• b6a6ad88e7 分组SQL调整 king 2026-03-10 15:04:48 +08:00
• 3c1274c3d6 Merge branch 'master' into dev_js_20260309 king 2026-03-10 14:37:07 +08:00
• b021d2ef01 删除打印 king 2026-03-10 14:36:06 +08:00
• 2fa40c266f Merge pull request '实现前置增强逻辑，再实现“综合销售情况表” 动态分组逻辑' (#25) from dev_js_20260309 into master admin 2026-03-10 14:32:51 +08:00
• 56cb31c616 根据tokne获取用户信息 chy 2026-03-10 14:23:28 +08:00
• 1c9d3b831c 实现前置增强逻辑，再实现“综合销售情况表” 动态分组逻辑 king 2026-03-10 14:13:57 +08:00
• de1774b2d3 修改配置文件 chy 2026-03-10 11:13:56 +08:00
• 43e66ea9c6 根据ticket获取用户信息 chy 2026-03-10 11:09:46 +08:00
• f494611789 Merge pull request '销售明细表定时任务' (#24) from liug into master admin 2026-03-06 23:01:12 +08:00
• 8bae1cbd35 销售明细表定时任务 liug hardy.liu 2026-03-06 15:00:08 +08:00
• ee7510f41e 修改统一身份认证 chy 2026-03-02 15:15:41 +08:00
• 44279d9637 修改统一身份认证 chy 2026-03-02 10:34:45 +08:00
• 860afb9812 Merge pull request '新增字段' (#23) from dpx20260211 into master admin 2026-02-28 08:44:07 +08:00
• 0ef88ce81d 新增字段 dpx20260211 dongpx 2026-02-28 08:24:32 +08:00
• 1b81782767 Merge pull request '应用查询按字典排序值排序' (#21) from main_hhl0209 into master admin 2026-02-25 14:01:54 +08:00
• 432feb11d2 Merge pull request 'dpx20260211' (#22) from dpx20260211 into master admin 2026-02-25 14:01:28 +08:00
• c4ea4650bf Merge branch 'master' into main_hhl0209 main_hhl0209 admin 2026-02-25 14:00:25 +08:00
• 1173de364c 新增字段 dongpx 2026-02-25 10:06:15 +08:00
• 79cb1297db 修改认证 chy 2026-02-22 21:40:47 +08:00
• 7fb9543604 新增字段 dongpx 2026-02-14 00:38:17 +08:00
• bac75778ad 修改字段长度 dongpx 2026-02-12 11:45:36 +08:00
• 3dd11b9f37 新增字段 dongpx 2026-02-12 08:38:19 +08:00
• f940b2a911 新增文档 chy 2026-02-11 14:58:26 +08:00
• 0cc088c51b 应用查询按字典排序值排序 huhanlin 2026-02-11 14:42:09 +08:00
• 869ef2cd8b Merge pull request 'ceshi' (#20) from dpx20260211 into master dongpx 2026-02-11 11:35:01 +08:00
• 35d708612e ceshi dongpx 2026-02-11 11:33:57 +08:00
• dcb15b1aa7 是否隐藏列 chy 2026-02-11 11:18:38 +08:00
• 390172f426 合并hhl代码 chy 2026-02-11 10:11:14 +08:00
• 0f61e5b8f2 Merge remote-tracking branch '20260209/main_hhl0209' chy 2026-02-11 10:10:27 +08:00
• 909d9625cd 获得角色拥有的应用id接口权限修改 huhanlin 2026-02-10 15:21:16 +08:00
• cd7bb5ccc5 应用权限功能 huhanlin 2026-02-10 14:22:55 +08:00
• bb986102f3 修改配置代码 chy 2026-02-10 10:50:32 +08:00
• 2cae542098 新增维度隐藏字段 chy 2026-02-10 10:42:42 +08:00
• 549da7ec80 应用表单增加回调url和应用分类字段，重定向url改为单个字符串 chy 2026-02-10 10:35:11 +08:00
• 8b9f4a5013 修改代码 chy 2026-02-10 00:19:46 +08:00
• 3de7be34b2 删除无用文件 chy 2026-02-09 23:49:37 +08:00
• e0dd2a59ec 合并董潘祥冲突 chy 2026-02-09 23:45:51 +08:00
• da95ddf810 合并董潘祥冲突 chy 2026-02-09 23:44:07 +08:00
• c8b73763bb Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_java chy 2026-02-09 23:43:07 +08:00
• 72331c5e1e 合并20260204分支 chy 2026-02-09 23:34:56 +08:00
• fa8c84f349 Merge branch '20260204' chy 2026-02-09 23:30:06 +08:00
• e70fa733ef Merge pull request 'main_hhl0209' (#10) from main_hhl0209 into main admin 2026-02-09 23:12:58 +08:00
• 246591bb1c Signed-off-by: dongpx <2112323174@qq.com> dongpx 2026-02-09 20:12:51 +08:00
• 56e09151e4 应用表单增加回调url和应用分类字段，重定向url改为单个字符串 huhanlin 2026-02-09 14:50:42 +08:00
• 7a9ae35c18 测试提交 huhanlin 2026-02-09 12:17:06 +08:00
• c1a3e0f709 修改代码 chy 2026-02-09 11:19:24 +08:00
• 16a985e8cc 修改 chy 2026-02-09 11:14:17 +08:00
• 55d050fbd7 111 chy 2026-02-09 00:27:50 +08:00
• 861f082e66 ·1 chy 2026-02-09 00:16:21 +08:00
• 8c97c0f934 Signed-off-by: dongpx <2112323174@qq.com> dongpx 2026-02-08 22:22:27 +08:00
• b629c574f1 Changes dongpx 2026-02-08 22:20:56 +08:00
• 918ec6c498 Changes dongpx 2026-02-05 13:20:41 +08:00
• 81bc9757eb Merge remote-tracking branch 'remotes/origin/20260204' chy 2026-02-05 13:15:03 +08:00
• 92674cff52 Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_java chy 2026-02-05 13:12:17 +08:00
• b7ebd3778d Signed-off-by: dongpx <2112323174@qq.com> dongpx 2026-02-05 10:37:57 +08:00
• 4f0e1bc860 Merge branch 'main' of http://8.130.49.250:3000/admin/gr_report_java chy 2026-02-05 07:22:03 +08:00
• a1c91f2959 测试提交分支 Signed-off-by: dongpx <2112323174@qq.com> dongpx 2026-02-04 11:05:43 +08:00
• 4cf2e2e90c 更新 dongpx 2026-02-04 11:00:05 +08:00
• 3c9eb35f2c Signed-off-by: dongpx <2112323174@qq.com> dongpx 2026-02-04 10:55:43 +08:00
• e392221045 更新董潘祥代码 chy 2026-02-03 15:50:37 +08:00
• 1c212fb3b3 Signed-off-by: chy <chy@163.com> chy 2026-02-02 23:21:53 +08:00