Commit Graph
320 Commits
Author SHA1 Message Date
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
@jyuhsin b6d7127ec7 Merge remote-tracking branch 'origin/main' 2025-10-19 16:55:40 +08:00
@jyuhsin 0effb78ef1 commit 2025-10-19 16:50:48 +08:00
Paidax 1d5786324b bug_commit 2025-10-19 16:50:36 +08:00
Paidax 94c153c101 bug_commit 2025-10-19 16:48:00 +08:00
= 7f0843ed5a 查询修改 2025-10-19 14:26:25 +08:00
c-zhouhf1 c9e825ecb9 commit 2025-10-19 13:43:18 +08:00
@jyuhsin 95133e6aca commit 2025-10-19 11:27:31 +08:00
Paidax ca2e204395 commit 2025-10-17 15:49:02 +08:00
@jyuhsin 1cb3ee9d58 commit 2025-10-17 15:23:10 +08:00
那些花儿 a5f278375a .. 2025-10-17 15:21:01 +08:00
那些花儿 e188075b3f Merge remote-tracking branch 'origin/main' 2025-10-17 15:11:38 +08:00
那些花儿 e8c050b685 .. 2025-10-17 15:11:20 +08:00
Paidax 0e1e632b98 会员去除身份证、手机、邮箱校验 2025-10-17 15:04:31 +08:00
Paidax b226138e5f Merge remote-tracking branch 'origin/main' 2025-10-17 14:38:03 +08:00
Paidax a44b2221c9 会员 2025-10-17 14:37:22 +08:00
那些花儿 501e64022b .. 2025-10-17 14:18:52 +08:00
@jyuhsin b729639d01 Merge remote-tracking branch 'origin/main' 2025-10-17 11:13:36 +08:00
@jyuhsin 225ed25736 commit 2025-10-17 11:13:19 +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
那些花儿 a54d550796 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html
#	src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html
#	src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html
2025-10-17 08:55:43 +08:00
那些花儿 901db5224f .. 2025-10-17 08:54:14 +08:00
Paidax 5a39de9794 会员 2025-10-17 08:43:06 +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
@jyuhsin 86ee1c4d64 commit 2025-10-16 20:32:25 +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
那些花儿 fbcee4d894 .. 2025-10-16 18:25:14 +08:00
@jyuhsin 45ee9b7285 commit 2025-10-16 16:55:32 +08:00
@jyuhsin 6f3e1ae47c commit 2025-10-16 10:47:25 +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
@jyuhsin 0b7fea7a41 commit 2025-10-15 15:18:53 +08:00
那些花儿 a82f41ca34 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionBoxQueryController.java
#	src/main/java/com/budwk/app/zhgh/democratic/suggestionBox/controller/SuggestionXghController.java
#	src/main/resources/views/platform/zhgh/democratic/suggestionBox/query/index.html
#	src/main/resources/views/platform/zhgh/democratic/suggestionBox/xgh/index.html
2025-10-15 10:36:38 +08:00
那些花儿 49a29dab7b .. 2025-10-15 10:33:33 +08:00
@jyuhsin 67293bdca3 Merge remote-tracking branch 'origin/main' 2025-10-15 10:27:29 +08:00
@jyuhsin dc7e71f2a1 commit 2025-10-15 10:26:51 +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
c-zhouhf1 e7b24d3afb commit 2025-10-14 14:15:20 +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
c-zhouhf1 d1bc1dec50 commit 2025-10-10 14:32:52 +08:00