Commit Graph

5789 Commits

Author SHA1 Message Date
joshen
05e9af99bf Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220 2025-05-09 16:55:51 +08:00
wangjh12
d1247e85c4 报告 2025-05-09 16:48:59 +08:00
wangjh12
4d49b3b757 报告 2025-05-09 16:40:12 +08:00
wangjh12
2dca1f4a86 报告 2025-05-09 16:17:13 +08:00
joshen
bb155ea44b Merge branch '250507-bugfix-shl' into test20250220 2025-05-09 11:29:06 +08:00
sunhonglai
d927958f24 修改热区 2025-05-09 11:28:46 +08:00
joshen
d00fdb589e Merge branch '250507-bugfix-shl' into test20250220
# Conflicts:
#	src/views/lecturer/InsideLecturer.vue
#	src/views/lecturer/LecturerFee.vue
2025-05-09 11:12:07 +08:00
sunhonglai
67a61180b0 修改热区 2025-05-09 11:08:00 +08:00
joshen
72268b1c5b Merge branch '250427-bugfix-shl' into test20250220 2025-05-09 09:48:03 +08:00
sunhonglai
e600aea509 授课记录和讲师列表新增增加搜索 2025-05-09 09:47:24 +08:00
joshen
f6356c5b58 Merge branch '250427-bugfix-shl' into test20250220 2025-05-09 09:40:23 +08:00
sunhonglai
d5a233656b 授课记录和讲师列表新增增加搜索 2025-05-09 09:39:02 +08:00
joshen
a381b82845 Merge branch '250507-bugfix-shl' into test20250220 2025-05-08 16:45:15 +08:00
sunhonglai
de680cb3c4 讲师列表修改查看认证展示规则 2025-05-08 16:44:36 +08:00
joshen
46fa735526 Merge branch '250427-bugfix-shl' into test20250220 2025-05-08 15:21:29 +08:00
sunhonglai
2fe8f957be 讲师费管理新增去除培训发生组织全部 2025-05-08 15:21:01 +08:00
joshen
5107b95a54 Merge branch '250427-bugfix-shl' into test20250220 2025-05-08 14:41:34 +08:00
sunhonglai
190054d2c5 修改历史验证删除逻辑问题 2025-05-08 14:40:55 +08:00
sunhonglai
7095235009 去掉无用代码 2025-05-07 15:53:05 +08:00
joshen
de1baf1a25 Merge branch '250507-bugfix-shl' into test20250220 2025-05-07 14:20:40 +08:00
sunhonglai
374a2c8776 修改问题 2025-05-07 14:20:04 +08:00
joshen
a80be22a7d Merge branch '250507-bugfix-shl' into test20250220 2025-05-07 14:02:43 +08:00
sunhonglai
78eadc5a46 修改搜索键 2025-05-07 14:01:36 +08:00
joshen
5d8b69a7b8 Merge branch '250507-bugfix-shl' into test20250220 2025-05-07 13:46:26 +08:00
sunhonglai
abefb88f3b 修改搜索顺序 2025-05-07 13:44:06 +08:00
joshen
8e660939b0 Merge branch '250507-bugfix-shl' into test20250220 2025-05-07 13:10:55 +08:00
sunhonglai
7f243b3154 szx-1090需求 2025-05-07 13:06:19 +08:00
sunhonglai
da7dca34a1 szx-1087需求 2025-05-07 10:35:51 +08:00
joshen
0b4c0cb2d3 Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220 2025-04-30 17:42:18 +08:00
wangjh12
f9ec0cb65f 报告 2025-04-30 17:41:43 +08:00
joshen
f87bf9252c Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220 2025-04-30 17:18:29 +08:00
wangjh12
4a449f3857 报告 2025-04-30 17:15:52 +08:00
wangjh12
3b824b19d4 报告 2025-04-30 17:10:27 +08:00
wangjh12
c88bb82754 报告 2025-04-30 17:01:50 +08:00
joshen
b644c672a3 Merge branch '250427-bugfix-shl' into test20250220 2025-04-30 14:44:12 +08:00
sunhonglai
033da81cbb 新增去除全部 2025-04-30 14:43:29 +08:00
joshen
209098b71c Merge branch '250427-bugfix-shl' into test20250220 2025-04-30 14:07:37 +08:00
sunhonglai
587ba14edf 修改选项样式和新增去除全部 2025-04-30 14:05:19 +08:00
joshen
ac3f3d4169 Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220 2025-04-30 14:03:16 +08:00
joshen
c86ef3aece Merge branch '250427-bugfix-shl' into test20250220 2025-04-30 13:04:25 +08:00
sunhonglai
7ed95ed624 修改SZX-1087和SZX-1088问题 2025-04-30 11:56:43 +08:00
wangjh12
0ac164064c 报告 2025-04-30 09:35:33 +08:00
joshen
7c1bd0cd05 Merge branch '250427-bugfix-shl' into test20250220 2025-04-28 14:52:42 +08:00
sunhonglai
4fef83123b 讲师组织倒排 2025-04-28 14:52:16 +08:00
joshen
3d8297ce04 Merge branch '250427-bugfix-shl' into test20250220 2025-04-28 14:47:53 +08:00
sunhonglai
e83591be45 讲师组织倒排 2025-04-28 14:46:26 +08:00
joshen
e5680e3121 Merge branch '250427-bugfix-shl' into test20250220 2025-04-28 14:29:05 +08:00
sunhonglai
044b20e02d 修改验证提示文案 2025-04-28 14:28:12 +08:00
joshen
7502538bd9 Merge branch '250427-bugfix-shl' into test20250220 2025-04-28 14:17:58 +08:00
sunhonglai
c58220107b 恢复原提示,优化增训发生组织搜索 2025-04-28 14:17:33 +08:00