c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
409 Commits 1 Branch 0 Tags
a744359fd6c73049f321acd9405191c94de82831
Commit Graph
64 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
= 586764e0be Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-11-17 08:59:19 +08:00
= b7996979a2 两委委员推选-代表团推选改成分工会推选 2025-11-17 08:58:59 +08:00
= 42ca668f6e 女职工卫生费 2025-11-07 15:17:06 +08:00
= 2f9a27d2a0 女职工卫生费 2025-11-03 15:45:21 +08:00
= f290949019 女职工卫生费75% 2025-11-03 08:52:46 +08:00
= a5bdf21346 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-30 11:42:53 +08:00
= 3bb7bf14e0 bug整改，单身联谊 2025-10-30 11:42:28 +08:00
= a3fd6a1c26 工会干部培训、健身卡、省级互助保障 2025-10-28 15:28:19 +08:00
= 712b1ea597 工会干部培训 2025-10-27 16:28:42 +08:00
= 78c80c298b Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-19 19:49:04 +08:00
= 96bbfe1706 修改 2025-10-19 19:48:54 +08:00
= 6e5c612600 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-19 18:47:46 +08:00
= 2e4c9261c7 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-19 18:46:32 +08:00
= 7ff317afb6 查询修改 2025-10-19 18:46:18 +08:00
= 7f0843ed5a 查询修改 2025-10-19 14:26:25 +08:00
= 48981a1304 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-17 08:40:38 +08:00
= 575a40c235 查询优化 2025-10-16 21:01:36 +08:00
= bb3038ef08 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 
# Conflicts:
#	src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/index.html
#	src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationTwoPush/index.html
#	src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeMember/index.html
#	src/main/resources/views/platform/zhgh/democratic/executiveCommittee/preparatoryGroupPush/index.html
 2025-10-16 18:28:28 +08:00
= 049de15cd8 commit 2025-10-16 18:26:14 +08:00
= 5c4a1de207 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-15 10:52:05 +08:00
= 0ec3a356b5 commit 2025-10-15 10:51:22 +08:00
= c20d5378e6 建言献策 2025-10-15 09:47:31 +08:00
= 9a8ed547e2 互助保障审核删除 2025-10-15 09:01:55 +08:00
= f3a8598e91 健身卡 2025-10-14 17:04:38 +08:00
= 0e12c436a7 姓名/工号查询 2025-10-13 11:27:33 +08:00
= a451975ebd Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-11 16:06:35 +08:00
= dc55b0701d bug修改 2025-10-10 08:59:32 +08:00
= f57481cd78 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-30 16:02:24 +08:00
= 02d2323834 bug修改 2025-09-30 16:02:12 +08:00
= aa516ab4e7 独生子女父母退休bug修改 2025-09-30 13:46:57 +08:00
= 85501dfc49 省级互助保障修改 2025-09-29 16:31:11 +08:00
= 00986fb79d Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-25 20:41:17 +08:00
= 70354770f2 建言献策手机端路径 2025-09-25 20:41:02 +08:00
= 978b6b856c 1 2025-09-25 18:57:52 +08:00
= e38fe38967 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-25 16:25:14 +08:00
= dc72dab666 省级互助保障 2025-09-25 16:24:59 +08:00
= 033ceba110 生育休假申请修改，新增工会干部培训 2025-09-23 16:00:16 +08:00
= c8c83e5abd 生育休假、独生子女父母退休 2025-09-19 14:08:22 +08:00
= bd96676929 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 
# Conflicts:
#	src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html
 2025-09-19 09:39:00 +08:00
= 90f37ef369 生育休假、独生子女父母退休移动端 2025-09-19 09:37:26 +08:00
= d377676758 Merge remote-tracking branch 'origin/main' 2025-09-18 08:40:17 +08:00
= edfd0eb61d 子女信息bug 2025-09-17 17:56:28 +08:00
= 3783f34ce6 独生子女父母退休 2025-09-17 17:43:59 +08:00
= 90c6b4b8ed Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-16 19:57:05 +08:00
= 9befc77e89 生育休假 2025-09-16 19:56:51 +08:00
= 9821aebd0a Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-15 15:45:33 +08:00
= b21a619991 bug整改 2025-09-15 15:43:53 +08:00
= 11b90741be bug整改 2025-09-13 17:20:11 +08:00
= b21f51bea0 bug整改 2025-09-13 17:06:18 +08:00
= c27136f894 体检移动端 2025-09-12 17:38:48 +08:00
= f2c5ccf515 工会报销移动端 2025-09-10 17:31:26 +08:00
= 5f332883db 工会报销移动端 2025-09-10 17:30:58 +08:00
= eaf1748cf9 子女信息管理移动端 2025-09-08 14:05:41 +08:00
= 3721e72d07 文化活动，撤回、重新提交整改 2025-09-05 14:59:52 +08:00
= 6fad5623c5 活动- 文化活动、作品征集bug整改 2025-09-05 11:50:49 +08:00
= 6ea2ad37b0 导出报销凭证表（签字导出报错） 2025-09-03 10:23:33 +08:00
= b7c6db374c Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-03 08:45:25 +08:00
= b827811367 bug修改 2025-09-03 08:44:51 +08:00
= 172b7e93d9 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-02 17:47:28 +08:00
= a0cf0a4800 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-02 16:36:29 +08:00
= fd59afe07d Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-02 14:13:25 +08:00
= 773c113fcf bug修改 2025-09-02 14:12:57 +08:00
= 1c805dcd51 子女信息管理 2025-09-01 17:53:01 +08:00
= a08ae49f03 工会报销 2025-08-29 17:43:04 +08:00