Commit Graph
198 Commits
Author SHA1 Message Date
c-chenxs1 67bcbfc737 feat: 品牌工作室脚本提交 2026-08-29 09:08:14 +08:00
c-chenxs1 19bbd61436 feat: 品牌工作室迁移完成 2026-08-19 18:04:39 +08:00
c-chenxs1 d38d48a147 Merge branch 'main' into feature_品牌工作室 2026-08-19 09:25:28 +08:00
c-chenxs1 1b17c3434b feat: 品牌工作室初始化提交 2026-08-19 09:17:12 +08:00
c-zhouhf1 e4485d7b02 commit 2026-08-13 08:39:26 +08:00
c-chenxs1 1096ea245f feat: 初始化gitignore和readme 2026-08-10 10:48:36 +08:00
= ec900e5b4d commit 2026-08-05 10:27:25 +08:00
= d5f4543493 Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_cug_v4 2026-08-05 08:43:28 +08:00
= de5f8dc9ba commit 2026-08-05 08:35:17 +08:00
c-zhouhf1 6e3279e485 commit 2026-08-04 11:04:15 +08:00
= ff3e8075b5 commit 2026-07-29 16:50:05 +08:00
= e8ed1d93f9 commit 2026-07-29 13:44:45 +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-duxc1 b2aef12c84 新增活动电子档案模块; 2026-07-28 16:55:02 +08:00
c-duxc1 a8a4052c45 新增活动电子档案模块; 2026-07-28 15:59:45 +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
zhouhefeng 4475404f70 Changes 2026-07-10 08:42:57 +08:00
c-zhouhf1 783e2b1fb0 commit 2026-07-08 15:28:09 +08:00
c-zhouhf1 f7f239c68b commit 2026-07-08 09:51:11 +08:00
c-zhangr1 37a17972af Merge remote-tracking branch 'origin/main' 2026-07-08 09:26:37 +08:00