Commit Graph
134 Commits
Author SHA1 Message Date
c-zhouhf1 a1091d846a commit 2025-04-03 10:30:01 +08:00
zhengziru ba03111377 Merge remote-tracking branch 'origin/main' 2025-04-03 09:49:34 +08:00
zhengziru 2df0f324cb server_commit 2025-04-03 09:49:13 +08:00
c-zhouhf1 6a09a764ec commit 2025-04-03 08:56:03 +08:00
zhengziru 37c2a4a74e Merge branch 'main' of https://dd3skj.picp.vip/zhengziru/zhgh_hrbnu 2025-04-02 15:43:19 +08:00
Paidax a5a904618a 公众号免登录 2025-04-02 15:42:23 +08:00
zhengziru 9b17a5dfbc Merge branch 'main' of https://dd3skj.picp.vip/zhengziru/zhgh_hrbnu 2025-04-02 14:26:42 +08:00
zhengziru 931acaa20e server_commit 2025-04-02 14:25:14 +08:00
c-zhouhf1 0c644ac349 commit 2025-03-11 19:40:34 +08:00
c-zhouhf1 ec49bcfa8b commit 2025-03-11 19:09:45 +08:00
Paidax 163731588c Merge remote-tracking branch 'origin/main' 2025-03-11 18:25:46 +08:00
Paidax 426f51ed74 微信支付 2025-03-11 18:25:28 +08:00
@jyuhsin e09d1e1649 commit 2025-03-11 18:10:07 +08:00
Paidax 4c58e0fbdb 微信免密登录 2025-03-11 15:52:04 +08:00
Paidax 2909e01111 支付 2025-03-11 10:47:04 +08:00
Paidax 3d92f0df29 支付 2025-03-11 10:22:25 +08:00
Paidax f822ef2046 支付 2025-03-11 08:42:14 +08:00
c-zhouhf1 7f02dffebe commit 2025-03-10 20:08:15 +08:00
c-zhouhf1 c4cf4106c2 Merge remote-tracking branch 'origin/main' 2025-03-10 19:26:11 +08:00
c-zhouhf1 0ec1c55038 commit 2025-03-10 19:25:57 +08:00
Paidax d0f6bcb3f4 支付 2025-03-10 11:49:42 +08:00
Paidax 8b795f8343 支付 2025-03-10 11:27:58 +08:00
Paidax 0d3bafb328 微信支付、福利 2025-03-10 09:40:09 +08:00
= d5a8dd7534 缴费 2025-03-07 14:11:11 +08:00
= 55e9010fb5 缴费 2025-03-07 11:17:13 +08:00
= 61357693b8 缴费 2025-03-06 20:41:51 +08:00
= 8d2f7a09bb 缴费 2025-03-05 18:39:33 +08:00
Paidax a9aa038a67 每日进入刷新缓存 2025-02-28 17:48:07 +08:00
Paidax a860f9699b Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java
#	src/main/resources/views/platform/jf/reimbursement/mine.html
#	src/main/resources/views/platform/jf/reimbursement/unionChairman.html
#	src/main/resources/views/platform/shopping/shoppingTypeApply.html
2025-02-28 17:06:55 +08:00
Paidax f539184fca 活动申报+基层工会 2025-02-28 17:01:09 +08:00
zhengziru daa4a24db5 server_commit 2025-02-28 11:51:18 +08:00
zhengziru 33d144027c server_commit 2025-02-27 16:53:51 +08:00
zhengziru 3d3749b820 Merge remote-tracking branch 'origin/main' 2025-02-24 19:23:23 +08:00
c-zhouhf1 ade702a2d4 commit 2025-02-11 13:40:04 +08:00
Paidax f7d05c43a0 bug整改 2025-02-10 15:10:38 +08:00
c-zhouhf1 73a42d3f1c commit 2025-02-10 15:09:18 +08:00
c-zhouhf1 7521c15ffa commit 2025-02-10 14:22:41 +08:00
c-zhouhf1 24c228e6fc commit 2025-02-10 13:53:48 +08:00
Paidax 567da06823 bug整改 2025-02-10 08:58:39 +08:00
zhengziru 9f65d0f723 Merge remote-tracking branch 'origin/main' 2025-01-09 14:53:15 +08:00
c-zhouhf1 8fd04f131d commit 2024-12-17 18:05:05 +08:00
c-zhouhf1 39d2bfe22e commit 2024-12-17 14:53:38 +08:00
zhengziru 238e8a5be3 server_commit 2024-12-10 19:15:24 +08:00
c-zhouhf1 a453c6b0e3 commit 2024-12-10 19:12:46 +08:00
c-zhouhf1 9c5a41627f commit 2024-12-10 18:59:42 +08:00
c-zhouhf1 fa4ac9605d commit 2024-12-10 18:24:49 +08:00
c-zhouhf1 3a0b62e103 commit 2024-12-10 18:16:06 +08:00
c-zhouhf1 f124ef63e0 Merge remote-tracking branch 'origin/main' 2024-12-10 08:55:53 +08:00
c-zhouhf1 e345b088ae commit 2024-12-10 08:55:39 +08:00
Paidax 892a91bc9e commit 2024-12-09 17:31:56 +08:00