Commit Graph

Select branches

Hide Pull Requests

main

release_prd

Mono Color

• 743e6c5428 修改亲子活动修改报名信息后，候补机制不会触发问题 main c-zhouhf1 2026-11-06 09:21:47 +08:00
• 09e955fb38 整改收货地址可以导出全部的福利地址 c-zhouhf1 2026-11-05 17:14:16 +08:00
• 7f578e1f9e 整改收货地址可以导出全部的福利地址 c-zhouhf1 2026-11-05 11:50:13 +08:00
• d8f6298dd8 整改收货地址可以导出全部的福利地址 c-zhouhf1 2026-11-05 11:10:12 +08:00
• 6b0586b638 整改亲子活动报名规则 c-zhouhf1 2026-11-05 10:45:07 +08:00
• 15aef647d1 Merge branch 'main' of http://gitea.dd3skj.com/c-zhangr1/zhgh_njnu c-zhouhf1 2026-10-15 09:27:05 +08:00
• f3021514fd 福利手机端可以代选，可以在手机上 品牌活动也可以在手机上查看报名人数 c-zhouhf1 2026-10-15 09:26:55 +08:00
• 4856cd5ddb 优化移动端: 1、最新活动放到最上面；2、版面变大，图片拿掉，最新的尽量显示 c-zhangr1 2026-10-09 15:06:16 +08:00
• a09c6ae2c9 Merge branch 'fix_俱乐部模块' into release_prd release_prd c-chenxs1 2026-09-29 10:28:14 +08:00
• d197c78b9c feat: 补充脚本3 c-chenxs1 2026-09-29 10:28:03 +08:00
• dbca87f09c Merge branch 'release_prd' of http://gitea.dd3skj.com/c-zhangr1/zhgh_njnu into release_prd c-chenxs1 2026-09-29 10:20:37 +08:00
• 38b1a09e11 Merge branch 'fix_俱乐部模块' into release_prd c-chenxs1 2026-09-29 10:20:33 +08:00
• 5cecb3b185 Merge branch 'feature_学习教育平台' into release_prd c-chenxs1 2026-09-29 10:20:29 +08:00
• fc727c690a Merge branch 'feature_学习教育平台' of http://gitea.dd3skj.com/c-zhangr1/zhgh_njnu into feature_学习教育平台 c-chenxs1 2026-09-29 10:20:09 +08:00
• 063e22491a feat: 补充脚本2 c-chenxs1 2026-09-29 10:19:57 +08:00
• 48ebcc148d feat: 补充脚本 c-chenxs1 2026-09-29 10:19:27 +08:00
• 50f82e05e5 Merge branch 'feature_学习教育平台' into release_prd @jyuhsin 2026-09-29 09:39:43 +08:00
• f700d0c6fb fix: 修复脚本path @jyuhsin 2026-09-29 09:39:04 +08:00
• 94fa74af53 Merge branch 'feature_学习教育平台' into release_prd c-chenxs1 2026-09-28 21:01:20 +08:00
• d717330657 feat: 学习板块，线上课程，网课 完成 c-chenxs1 2026-09-28 20:57:03 +08:00
• 3c3e64f2be feat: 移动端-协会审核-退回-拒绝-通过完整流程优化 c-chenxs1 2026-09-28 14:27:25 +08:00
• a18f77cd68 feat: 移动端-协会审核 c-chenxs1 2026-09-23 18:27:31 +08:00
• 486934f3b6 亲子活动模块整改-1.2 c-zhangr1 2026-09-10 17:43:53 +08:00
• e3eb5b639b Merge branch 'main' of http://gitea.dd3skj.com/c-zhangr1/zhgh_njnu c-chenxs1 2026-09-10 10:59:45 +08:00
• f5e5720120 Merge remote-tracking branch 'origin/main' c-zhangr1 2026-09-10 10:59:07 +08:00
• 36d844a1e8 feat: 信息中心获取 用户时补充不存在单位2 c-chenxs1 2026-09-10 10:59:01 +08:00
• caf83bdbd9 feat: 信息中心获取 用户时补充不存在单位 c-chenxs1 2026-09-10 10:58:12 +08:00
• e0ecdda400 亲子活动模块整改-1.2 c-zhangr1 2026-09-10 10:57:51 +08:00
• 7d5d2da60f feat: 删除properties c-chenxs1 2026-09-09 18:40:20 +08:00
• 5f1ba33fd4 feat: 上传配置文件 c-chenxs1 2026-09-09 15:42:22 +08:00
• ecf8ad3536 亲子活动模块整改-1.1 c-zhangr1 2026-09-08 20:30:34 +08:00
• c75bcd4a92 亲子活动模块整改 c-zhangr1 2026-09-08 19:10:02 +08:00
• d198db9104 commit c-zhouhf1 2026-09-04 15:14:29 +08:00
• fab3a22666 职工福利-福利名单: 新增‘导出重复身份证号人员’按钮（仅超级管理员可见）; dd3s_206 2026-06-09 18:04:11 +08:00
• 21ae4889f0 会员管理-其他人员管理-人员管理: 新增导出按钮; dd3s_206 2026-06-08 17:46:17 +08:00
• 0440edd289 职工福利-选择情况: 导出选择情况表时如果联系电话(福利选择时录入)为空，就读取系统用户表手机号码字段； dd3s_206 2026-06-05 09:41:47 +08:00
• 4cb9e46fc5 职工福利：福利统计和选择情况新增‘管理员代选择’按钮；（查询和导出已同步）； dd3s_206 2026-06-03 18:24:43 +08:00
• 13b8af999a 亲子活动管理：新增活动且沿用之前活动时抹掉分活动主键id； dd3s_206 2026-06-01 14:05:16 +08:00
• 3f02802412 commit = 2026-05-29 10:41:52 +08:00
• 179698d0cd commit = 2026-05-28 14:08:29 +08:00
• a35966ef64 commit = 2026-05-27 10:07:13 +08:00
• 64c359b59d commit = 2026-05-27 09:50:46 +08:00
• a44d24eab1 commit server 2026-04-30 17:15:17 +08:00
• 89a9ec271c 品牌活动管理：解决活动二维码打不开，签到二维码采用活动二维码的打开方式显示 c-zhangr1 2026-04-30 09:35:04 +08:00
• 3f1c3b7610 品牌活动：扫码参与活动，控制参与人员范围 c-zhangr1 2026-04-27 18:01:19 +08:00
• fce211073a commit c-zhouhf1 2026-04-24 13:39:30 +08:00
• 0aca47b15e commit c-zhouhf1 2026-04-24 12:53:09 +08:00
• 3c3836ae90 commit c-zhouhf1 2026-04-17 14:21:48 +08:00
• 8ceb928fec commit c-zhouhf1 2026-04-17 12:21:33 +08:00
• 7fe175423a Merge remote-tracking branch 'origin/main' c-zhangr1 2026-04-16 19:38:59 +08:00
• fd467cdc21 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_njnu c-zhouhf1 2026-04-16 19:37:37 +08:00
• 88dcfb22c8 commit c-zhouhf1 2026-04-16 19:37:25 +08:00
• 2e39479b36 品牌活动控制类型不能删除（val：code）,多个编码用英文逗号拼接 c-zhangr1 2026-04-16 11:11:44 +08:00
• 34de77dd4c commit = 2026-04-07 13:54:36 +08:00
• 7f9f64cc34 commit server 2026-04-07 10:48:00 +08:00
• 5691b51202 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_njnu = 2026-03-13 13:51:46 +08:00
• 34003155cc commit = 2026-03-13 13:51:18 +08:00
• 03cacfdaff Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_njnu server 2026-03-13 11:28:08 +08:00
• ae636ce067 commit server 2026-03-13 11:27:57 +08:00
• d85094b2f2 协会手机端查看 = 2026-03-13 11:25:13 +08:00
• 68f2e0e906 commit = 2026-03-11 11:27:52 +08:00
• 4670470cb8 commit server 2026-03-09 17:55:48 +08:00
• b83c287b6a commit @jyuhsin 2026-03-05 14:33:44 +08:00
• e1b2229e6d commit @jyuhsin 2026-03-04 10:04:10 +08:00
• 92ddc74419 commit @jyuhsin 2026-03-03 18:18:57 +08:00
• 16adffa265 commit @jyuhsin 2026-03-03 18:17:37 +08:00
• 7533b6e09b commit @jyuhsin 2026-03-03 16:59:22 +08:00
• fe82558e4c commit @jyuhsin 2026-03-03 16:15:35 +08:00
• 6a3393b26f commit @jyuhsin 2026-03-03 16:10:29 +08:00
• d36d909851 福利修改选择结束后不能修改 c-zhouhf1 2026-02-06 09:27:24 +08:00
• e97ab46b75 .. server 2026-01-29 18:52:37 +08:00
• f42432eca9 commit @jyuhsin 2026-01-05 18:17:14 +08:00
• e524e020ef commit @jyuhsin 2026-01-05 16:53:50 +08:00
• 180d50ed95 commit @jyuhsin 2026-01-05 16:50:10 +08:00
• 41d697b6a8 commit @jyuhsin 2026-01-05 16:47:45 +08:00
• 7d8b34065f .. server 2026-01-05 14:37:51 +08:00
• c0fe550f15 commit @jyuhsin 2026-01-04 16:12:56 +08:00
• d622d70b6c commit @jyuhsin 2026-01-04 16:11:43 +08:00
• 8d30f2bb4b .. server 2026-01-04 16:00:48 +08:00
• f043be61fe Merge remote-tracking branch 'origin/main' @jyuhsin 2026-01-04 14:29:37 +08:00
• 1f5f221850 commit @jyuhsin 2026-01-04 14:28:56 +08:00
• 360eb3d9e6 福利项目开启关闭按钮 = 2025-12-09 17:18:57 +08:00
• b28a3a81c9 福利收货地址导出 = 2025-12-09 13:56:33 +08:00
• 075af05eb6 会员-按分工会/单位导出 = 2025-11-27 16:04:56 +08:00
• 4b12f3d5a5 .. server 2025-11-27 10:45:45 +08:00
• d2cdc72f3c commit @jyuhsin 2025-11-04 16:58:56 +08:00
• 6dcf896f14 commit @jyuhsin 2025-11-04 15:47:20 +08:00
• be2c2abb4f commit @jyuhsin 2025-11-04 15:32:08 +08:00
• 114dcf014c .. server 2025-11-01 09:57:06 +08:00
• af130baaf7 小程序 Paidax 2025-10-24 17:50:34 +08:00
• d0f80f57b5 .. 那些花儿 2025-10-22 11:36:11 +08:00
• 9427e8057e 会员升级 Paidax 2025-10-22 09:45:32 +08:00
• 2d7a74fd87 会员升级 Paidax 2025-10-21 17:24:21 +08:00
• 5b44c75aaf Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_njnu c-zhouhf1 2025-09-25 18:40:17 +08:00
• 3b8a5bc716 问卷 c-zhouhf1 2025-09-25 18:40:05 +08:00
• 8365d5d803 .. 那些花儿 2025-09-22 11:10:41 +08:00
• 7b0a8ca494 Merge remote-tracking branch 'origin/main' server 2025-09-22 10:43:13 +08:00
• 7716fc78f0 .. server 2025-09-22 10:42:51 +08:00
• 30b3f72b99 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_njnu c-zhouhf1 2025-09-20 16:28:16 +08:00
• ec54bcba12 会员、体育活动 c-zhouhf1 2025-09-20 16:27:55 +08:00