Commit Graph
245 Commits
Author SHA1 Message Date
c-chenxs1 1cbacf987d feat: 积分商城-基本实现拆单、确认收货2 2026-07-29 18:22:05 +08:00
c-duxc1 058f6b2563 web端-职代会管理-投票管理: 页面样式调整; 2026-07-29 16:08:05 +08:00
c-duxc1 bff78c6ced web端职代会管理: 修复congress_materials职代会资料文件的fileType,fileSize字段为空的问题; 2026-07-29 15:56:03 +08:00
c-chenxs1 d613a41854 feat: 积分商城-基本实现拆单、确认收货 2026-07-29 15:51:26 +08:00
c-duxc1 8bff6f8ce9 新增web端职代会管理(职代会届次取值teacher_congress_session表数据); 2026-07-29 14:57:41 +08:00
c-chenxs1 51a951d863 feat: 积分商城-补充 2026-07-29 10:11:25 +08:00
c-duxc1 a93cbc9704 Revert "新增活动电子档案模块;"
This reverts commit a8a4052c45.
2026-07-28 17:42:37 +08:00
c-duxc1 d90f87e453 Revert "新增活动电子档案模块;"
This reverts commit b2aef12c84.
2026-07-28 17:42:23 +08:00
c-chengc1 704bc278fa feat:浦发项目模块迁移-职代会h5端初始化 2026-07-28 17:27:29 +08:00
c-duxc1 b2aef12c84 新增活动电子档案模块; 2026-07-28 16:55:02 +08:00
c-duxc1 a8a4052c45 新增活动电子档案模块; 2026-07-28 15:59:45 +08:00
c-chengc1 5df36acc22 feat:浦发项目模块迁移-重大事项初始化 2026-07-28 10:54:28 +08:00
c-chenxs1 a2b769aeff feat: h5页面-积分商城首页优化 2026-07-27 15:09:52 +08:00
c-chenxs1 f054226683 feat: h5页面 2026-07-27 14:06:19 +08:00
c-chenxs1 a1a7527ca8 feat: 对账记录 2026-07-27 11:37:31 +08:00
c-chenxs1 5bbfba353d feat: 发票管理 2026-07-27 11:34:31 +08:00
c-chenxs1 2d8a31a3cc feat: 对账管理 2026-07-27 11:33:43 +08:00
c-chenxs1 d4e7e4282b feat: 消息推送 2026-07-27 11:17:15 +08:00
c-chenxs1 784350bb42 feat: 积分发放模块 2026-07-27 11:03:19 +08:00
c-chenxs1 dd7c35eb50 feat: 用户积分管理 2026-07-27 11:03:04 +08:00
c-chenxs1 a6a2471111 feat: web端初步完成 2026-07-27 08:41:32 +08:00
c-zhouhf1 785b9a4b80 commit 2026-07-23 18:30:30 +08:00
c-zhangr1 0936d61450 Merge remote-tracking branch 'origin/main' 2026-07-16 15:01:56 +08:00
c-zhangr1 65831a02dd change 2026-07-16 14:59:53 +08:00
zhouhefeng 730b0efebb Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
 Conflicts:
	src/main/java/com/budwk/app/zhgh/democratic/teachercongress/institution/controller/TeacherCongressInstitutionController.java
	src/main/resources/views/platform/zhgh/democratic/teachercongress/institution/basicTable.js
	src/main/resources/views/platform/zhgh/democratic/teachercongress/institution/index.html
2026-07-15 11:49:49 +08:00
zhouhefeng 3425888c91 commit 2026-07-15 11:47:47 +08:00
= 5c46d07f46 Merge remote-tracking branch 'origin/main' 2026-07-15 09:24:24 +08:00
= b974d84086 commit 2026-07-15 09:23:00 +08:00
c-zhouhf1 fb25ad45a8 commit 2026-07-14 18:05:53 +08:00
c-zhangr1 cbc0dcf67d change普惠疗休养 2026-07-14 17:41:39 +08:00
c-zhouhf1 2168888ca7 commit 2026-07-14 16:40:42 +08:00
c-zhouhf1 33687bbd66 Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-07-14 16:28:31 +08:00
c-zhouhf1 f39735f1f2 commit 2026-07-14 16:28:22 +08:00
= c504830db3 commit 2026-07-14 16:20:40 +08:00
= 24e2d9e826 commit 2026-07-14 09:19:04 +08:00
zhouhefeng 9b4f4d57be Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-07-14 09:15:41 +08:00
zhouhefeng cadd4bbffe Changes 2026-07-14 09:12:00 +08:00
c-zhouhf1 783e2b1fb0 commit 2026-07-08 15:28:09 +08:00
= 635038b25c commit 2026-07-07 10:24:37 +08:00
= 34627245ac commit 2026-07-03 17:25:27 +08:00
c-zhouhf1 6380842b34 commit 2026-07-03 17:10:35 +08:00
= 2e3c3e87da commit 2026-07-01 09:21:06 +08:00
zhouhefeng 601e1ac039 Changes 2026-06-15 14:20:03 +08:00
zhouhefeng 873213de53 Changes 2026-06-15 14:18:01 +08:00
zhouhefeng 449428b762 commit 2026-06-02 08:17:07 +08:00
c-zhouhf1 eff5c662d2 Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4
# Conflicts:
#	src/main/java/com/budwk/app/sys/controller/SysConfController.java
#	src/main/resources/views/layouts/v4/home/index.html
2026-06-01 08:41:59 +08:00
c-zhouhf1 79e61f8d99 commit 2026-06-01 08:41:09 +08:00
zhouhefeng 8b47088953 commit 2026-06-01 08:36:26 +08:00
c-zhouhf1 9d7fa18c53 commit 2026-05-29 09:21:40 +08:00
c-zhouhf1 02dde3fe3a Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-05-28 19:52:36 +08:00