Commit Graph
91 Commits
Author SHA1 Message Date
c-zhouhf1 c1dc69e089 commit 2026-01-28 10:50:28 +08:00
c-zhouhf1 75d6420f9b commit 2026-01-21 15:17:59 +08:00
c-zhouhf1 ccd9e9db16 commit 2026-01-13 16:33:46 +08:00
c-zhouhf1 a744359fd6 commit 2025-12-31 10:53:04 +08:00
c-zhouhf1 56718eca69 commit 2025-12-29 16:26:12 +08:00
c-zhouhf1 2742befa3d commit 2025-12-29 14:10:22 +08:00
c-zhouhf1 bdff0a2472 commit 2025-12-20 16:52:00 +08:00
c-zhouhf1 fa0606c27b commit 2025-12-12 17:04:48 +08:00
c-zhouhf1 3ff1815362 commit 2025-12-12 16:58:36 +08:00
c-zhouhf1 c8adcb9e1b commit 2025-12-12 16:27:55 +08:00
c-zhouhf1 0259286c04 commit 2025-12-11 18:54:37 +08:00
c-zhouhf1 8687313e2c commit 2025-12-11 18:48:17 +08:00
c-zhouhf1 e806e7d9f8 commit 2025-12-11 17:46:50 +08:00
c-zhouhf1 55d7578b67 commit 2025-12-11 14:47:56 +08:00
c-zhouhf1 bee5c04b95 commit 2025-12-11 14:10:11 +08:00
c-zhouhf1 89dc6a11d1 修改获取当前登录用户所在单位党委书记流程
修改为获取当前登录用户所在单位党委书记,若是机关就找出机关分下的党委书记。因为机关只有一个党委书记
2025-12-11 11:18:54 +08:00
c-zhouhf1 a97d05692f commit 2025-12-10 16:17:35 +08:00
c-zhouhf1 9ea0e0b8b3 commit 2025-12-10 16:16:59 +08:00
c-zhouhf1 b721d62dd1 增加工代会委员会管理 2025-12-10 15:55:26 +08:00
c-zhouhf1 14ce37f823 增加工代会委员会管理 2025-11-19 14:23:04 +08:00
c-zhouhf1 ab87cbb5c9 commit 2025-11-18 08:33:14 +08:00
c-zhouhf1 90026a54a3 commit 2025-11-06 18:45:55 +08:00
c-zhouhf1 d451c1ebdb commit 2025-11-06 18:43:57 +08:00
c-zhouhf1 61cde58679 commit 2025-11-06 18:31:30 +08:00
c-zhouhf1 1968db5e9a Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-11-01 11:19:35 +08:00
c-zhouhf1 7216481a1a commit 2025-11-01 11:19:19 +08:00
c-zhouhf1 4dff54c1dd commit 2025-10-31 11:16:32 +08:00
c-zhouhf1 cdd58734fd commit 2025-10-31 11:14:34 +08:00
c-zhouhf1 568617910e Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4
# Conflicts:
#	src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js
2025-10-31 11:09:16 +08:00
c-zhouhf1 593d76a267 commit 2025-10-31 11:04:51 +08:00
c-zhouhf1 291f307f04 commit 2025-10-29 16:24:34 +08:00
c-zhouhf1 c247c9a4d1 commit 2025-10-29 15:50:03 +08:00
c-zhouhf1 260e4c25ad commit 2025-10-29 09:14:00 +08:00
c-zhouhf1 c8f8280e32 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-19 20:00:43 +08:00
c-zhouhf1 7c14e477b1 commit 2025-10-19 20:00:35 +08:00
c-zhouhf1 4afee184cf Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4
# Conflicts:
#	src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java
#	src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
#	src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html
#	src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html
2025-10-19 18:55:16 +08:00
c-zhouhf1 1cc6e62f07 commit 2025-10-19 18:51:28 +08:00
c-zhouhf1 71860af928 commit 2025-10-19 18:46:49 +08:00
c-zhouhf1 908c8d4d76 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-19 17:18:40 +08:00
c-zhouhf1 d36cbacf66 commit 2025-10-19 17:18:21 +08:00
c-zhouhf1 be764149e4 commit 2025-10-19 17:18:13 +08:00
c-zhouhf1 c9e825ecb9 commit 2025-10-19 13:43:18 +08:00
c-zhouhf1 0cbe43b0e9 commit 2025-10-17 11:13:10 +08:00
c-zhouhf1 257b7588a7 commit 2025-10-17 11:07:33 +08:00
c-zhouhf1 e19c316f78 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-10-16 09:30:03 +08:00
c-zhouhf1 1f99486914 commit 2025-10-16 09:29:49 +08:00
c-zhouhf1 e7b24d3afb commit 2025-10-14 14:15:20 +08:00
c-zhouhf1 d1bc1dec50 commit 2025-10-10 14:32:52 +08:00
c-zhouhf1 c1f0989a49 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-30 15:49:11 +08:00
c-zhouhf1 f2ffc5b586 commit 2025-09-30 15:48:58 +08:00
c-zhouhf1 35b77a6770 commit 2025-09-28 08:51:55 +08:00
c-zhouhf1 2a5122c976 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-26 09:51:48 +08:00
c-zhouhf1 2ee12b7514 commit 2025-09-26 09:51:39 +08:00
c-zhouhf1 7427279857 commit 2025-09-25 21:32:56 +08:00
c-zhouhf1 9a6e9c0b0a Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-25 21:29:32 +08:00
c-zhouhf1 2810427b17 commit 2025-09-25 21:29:22 +08:00
c-zhouhf1 37e23100e1 Merge remote-tracking branch 'origin/main' 2025-09-25 09:20:12 +08:00
c-zhouhf1 be44b80099 commit 2025-09-25 09:19:48 +08:00
c-zhouhf1 88662caa57 commit 2025-09-23 11:16:17 +08:00
c-zhouhf1 dad96dbf17 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-23 10:33:06 +08:00
c-zhouhf1 2ecb9c82bd commit 2025-09-23 10:33:01 +08:00
c-zhouhf1 a09f7fac9f commit 2025-09-23 10:32:40 +08:00
c-zhouhf1 af146d6c9b Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-22 20:30:34 +08:00
c-zhouhf1 5977905f1e commit 2025-09-22 20:30:22 +08:00
c-zhouhf1 f88697c30a Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-09-18 18:49:01 +08:00
c-zhouhf1 5665fcf44a commit 2025-09-18 18:48:55 +08:00
c-zhouhf1 613eb000f3 commit 2025-09-13 15:18:43 +08:00
c-zhouhf1 c8a2ffcf9f commit 2025-09-13 14:56:17 +08:00
c-zhouhf1 b0e7aa89c2 commit 2025-09-13 14:42:21 +08:00
c-zhouhf1 5d01ca6aad commit 2025-09-10 16:49:01 +08:00
c-zhouhf1 2a1d1e11ed commit 2025-09-09 20:25:19 +08:00
c-zhouhf1 8e5b8a3523 commit 2025-09-06 15:38:55 +08:00
c-zhouhf1 98c602b116 commit 2025-09-06 15:26:02 +08:00
c-zhouhf1 23885590c5 commit 2025-09-04 09:57:51 +08:00
c-zhouhf1 3b87c4ec34 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4
# Conflicts:
#	src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/activityList/basicForm.js
2025-09-04 09:46:18 +08:00
c-zhouhf1 53e6c4bc52 commit 2025-09-04 09:40:50 +08:00
c-zhouhf1 cbc1956bc6 Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4 2025-08-29 18:02:55 +08:00
c-zhouhf1 c1263c753d commit 2025-08-29 18:01:56 +08:00
c-zhouhf1 43c848171d commit 2025-08-29 16:19:20 +08:00
c-zhouhf1 67082d07bd commit 2025-08-29 16:19:13 +08:00
c-zhouhf1 4367d3882f commit 2025-08-28 14:06:25 +08:00
c-zhouhf1 c93cf2f36c commit 2025-08-28 11:29:30 +08:00
c-zhouhf1 f364119414 commit 2025-08-28 11:29:13 +08:00
c-zhouhf1 0df2345b11 commit 2025-08-28 11:29:13 +08:00
c-zhouhf1 6ed230e78f commit 2025-08-28 11:29:13 +08:00
c-zhouhf1 65eb86c0dc commit 2025-08-20 15:16:40 +08:00
c-zhouhf1 ac02be1aec commit 2025-07-31 15:35:08 +08:00
c-zhouhf1 ab76df9d77 commit 2025-07-30 17:23:38 +08:00
c-zhouhf1 030cf7cc4c commit 2025-07-28 10:30:46 +08:00
c-zhouhf1 1573a20ec4 commit 2025-07-28 10:23:21 +08:00
c-zhouhf1 4d66cded17 积分管理 2025-07-18 16:16:36 +08:00