Commit Graph
202 Commits
Author SHA1 Message Date
c-chenxs1 31f4e5c4a6 feat: 积分商城菜单脚本提交 2026-08-29 10:25:51 +08:00
c-chenxs1 44cf66c570 feat: 积分商城-完成 2026-07-31 19:07:59 +08:00
c-chenxs1 9be904bde0 feat: 优化 2026-07-31 10:42:00 +08:00
c-chenxs1 5de4d6f9f4 feat: 已实现订单基本逻辑,到完成,却订单售后 2026-07-30 15:55:00 +08:00
c-chenxs1 1cbacf987d feat: 积分商城-基本实现拆单、确认收货2 2026-07-29 18:22:05 +08:00
c-chenxs1 d613a41854 feat: 积分商城-基本实现拆单、确认收货 2026-07-29 15:51:26 +08:00
c-chenxs1 51a951d863 feat: 积分商城-补充 2026-07-29 10:11:25 +08:00
c-chenxs1 0eefc705a1 feat: h5页面-积分商城-外部服务接口 2026-07-27 15:36:26 +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 a1047368fd feat: 对账记录2 2026-07-27 13:30:55 +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-chenxs1 08e6d08668 初始化gitignore 2026-07-24 17:08:12 +08:00
c-chenxs1 6d63e502ff 初始化数据库 2026-07-24 16:57:00 +08:00
c-zhouhf1 785b9a4b80 commit 2026-07-23 18:30:30 +08:00
c-zhouhf1 86ab0142da Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-07-22 13:55:54 +08:00
c-zhouhf1 6b4a3c0525 commit 2026-07-22 13:52:20 +08:00
c-zhangr1 f81544e67f change 2026-07-17 10:56:54 +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
= 73954cf4e7 commit 2026-07-15 11:13:08 +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 33a9a3df05 Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-07-14 16:41:16 +08:00
c-zhouhf1 2168888ca7 commit 2026-07-14 16:40:42 +08:00
= 2f8158a658 Merge remote-tracking branch 'origin/main' 2026-07-14 16:36:44 +08:00
c-zhangr1 71558c3df8 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/resources/views/platform/zhgh/democratic/proposal/transact/unitRead/index.html
2026-07-14 16:31:37 +08:00
c-zhangr1 68d8045179 1 2026-07-14 16:30:12 +08:00
= 5626139605 commit 2026-07-14 16:29:59 +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
c-zhangr1 924feefdeb Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/resources/db/menu/init_tour_menu.sql
#	src/main/resources/db/tour_setting_create.sql
#	src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/commonQuery.js
#	src/main/resources/views/platform/zhgh/staffmanage/member/change/common/commonQuery.js
#	src/main/resources/views/platform/zhgh/staffmanage/member/info/common/commonQuery.js
2026-07-14 16:27:39 +08:00
c-zhangr1 c7503cd4cc 1 2026-07-14 16:24:26 +08:00
= c504830db3 commit 2026-07-14 16:20:40 +08:00
c-zhangr1 fe250baef8 1 2026-07-14 14:35:17 +08:00
c-zhangr1 93ef06cfe6 1 2026-07-14 14:34:34 +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 8da7d2f3b4 Changes 2026-07-14 09:15:34 +08:00
zhouhefeng cadd4bbffe Changes 2026-07-14 09:12:00 +08:00