Commit Graph

Select branches

Hide Pull Requests

develop

huangsh_branch

liuzy_branch

main

pangqr_branch

tangxj_branch

xiexy_branch

Mono Color

• 3a0f3fca10 修正糖友圈发布管理 pangqr_branch YourName 2026-01-02 00:23:57 +0800
• 5cfa7407d7 Merge pull request '小程序设备导入数据修复' (#136) from liuzy_branch into develop develop hnu202326010221 2026-01-01 23:58:23 +0800
• 750fb9b803 小程序设备导入数据修复 liuzy_branch lzy-jay 2026-01-01 23:49:03 +0800
• 180514ebee Merge pull request '修正糖友圈举报管理、设备管理' (#135) from pangqr_branch into develop hnu202326010221 2026-01-01 23:14:03 +0800
• ba56228747 修正糖友圈举报管理、设备管理 YourName 2026-01-01 23:11:23 +0800
• 04ea4966d3 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch YourName 2026-01-01 23:10:37 +0800
• a931234790 修改web个人主页修改密码弹窗图层问题 黄思慧 2026-01-01 22:33:14 +0800
• 3bd086028d 修改他人个人主页按钮位置 黄思慧 2026-01-01 22:24:26 +0800
• ad0d854a34 Merge pull request '修正糖友圈发布管理、糖友圈举报管理、设备管理' (#134) from pangqr_branch into develop hnu202326010221 2026-01-01 21:35:04 +0800
• ec213e7e65 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch YourName 2026-01-01 21:33:14 +0800
• d368cde7cb 修正糖友圈发布管理、糖友圈举报管理、设备管理 YourName 2026-01-01 21:31:30 +0800
• 2137f6a7b5 Merge pull request '举报用户' (#133) from xiexy_branch into develop hnu202326010206 2026-01-01 20:34:04 +0800
• cbc36964f6 举报用户 xiexy_branch hnu202326010206 2026-01-01 20:27:44 +0800
• 8828802bc7 Merge pull request '资料编辑和隐私设置' (#132) from xiexy_branch into develop hnu202326010206 2026-01-01 19:33:50 +0800
• 723ebb7e73 隐私设置和编辑资料 hnu202326010206 2026-01-01 19:24:28 +0800
• e4cdfe2131 Merge refs/remotes/origin/develop into refs/heads/xiexy_branch hnu202326010206 2026-01-01 19:24:28 +0800
• eb5c7a6398 修复 hnu202326010206 2026-01-01 19:24:28 +0800
• 06267fa64b Merge pull request 'Redis' (#131) from liuzy_branch into develop hnu202326010221 2026-01-01 19:03:12 +0800
• ece4bcc2a7 Redis lzy-jay 2026-01-01 18:58:38 +0800
• e54408dd8b Merge pull request '恶意用户' (#130) from liuzy_branch into develop hnu202326010221 2026-01-01 18:43:27 +0800
• 28baee2eda Merge remote-tracking branch 'origin/develop' into liuzy_branch lzy-jay 2026-01-01 18:43:19 +0800
• 9a58a474c6 恶意用户 lzy-jay 2026-01-01 18:42:26 +0800
• c9c9db953f Merge pull request '私信修改' (#129) from xiexy_branch into develop hnu202326010206 2026-01-01 18:36:06 +0800
• 1716a4a253 Update AdminService.java hnu202326010206 2026-01-01 18:34:36 +0800
• 6e143b086a 私信修复 hnu202326010206 2026-01-01 18:09:33 +0800
• 2ab4cd7398 修复微信小程序退出登录的功能 黄思慧 2026-01-01 17:58:37 +0800
• fe848487ed 在web个人主页添加修改密码的功能 黄思慧 2026-01-01 17:48:11 +0800
• fcb20cecc1 Merge pull request '家庭邀请' (#127) from liuzy_branch into develop hnu202326010221 2026-01-01 17:45:27 +0800
• 05668db0dd 家庭邀请 lzy-jay 2026-01-01 17:44:14 +0800
• a21284be50 Merge pull request '家庭' (#126) from liuzy_branch into develop hnu202326010221 2026-01-01 16:51:03 +0800
• 754b5e70f6 Merge remote-tracking branch 'origin/develop' into liuzy_branch lzy-jay 2026-01-01 16:48:03 +0800
• ffe8c086fb 家庭 lzy-jay 2026-01-01 16:47:46 +0800
• bc53a90ba5 Merge pull request '二维码' (#125) from liuzy_branch into develop hnu202326010221 2026-01-01 15:42:17 +0800
• 65ed4fd83f 二维码 lzy-jay 2026-01-01 15:38:20 +0800
• 69b9c3b8f5 Merge pull request '编辑资料不能为空值的修复' (#124) from xiexy_branch into develop hnu202326010206 2026-01-01 15:16:43 +0800
• f0f6027654 编辑资料修复 hnu202326010206 2026-01-01 14:56:26 +0800
• 05386ee43a Merge refs/remotes/origin/develop into refs/heads/xiexy_branch hnu202326010206 2026-01-01 14:56:26 +0800
• 99c0446b7b Merge pull request '修正小程序监测计划和web知识百科管理的样式' (#123) from pangqr_branch into develop hnu202326010221 2026-01-01 15:08:56 +0800
• 9b72459510 修正小程序监测计划和web知识百科管理的样式 YourName 2026-01-01 15:06:34 +0800
• 7575254388 编辑资料修复 hnu202326010206 2026-01-01 14:56:26 +0800
• 22a70a5929 编辑资料不允许设置空值的修复 hnu202326010206 2026-01-01 14:56:26 +0800
• 37f6ea4f75 Merge pull request '小程序端从设备导入数据实现' (#121) from liuzy_branch into develop hnu202326010221 2025-12-31 22:35:21 +0800
• bc816a8cb5 小程序端从设备导入数据实现 lzy-jay 2025-12-31 22:31:56 +0800
• c7bde7b3c4 Merge pull request '后端输出删除' (#120) from xiexy_branch into develop hnu202326010206 2025-12-31 22:11:24 +0800
• dd3d38d69f 后端输出删除 hnu202326010206 2025-12-31 22:07:00 +0800
• 5a69f2b4a9 后端输出删除 hnu202326010206 2025-12-31 22:07:00 +0800
• d262ec2179 Merge pull request '首页时间' (#119) from liuzy_branch into develop hnu202326010221 2025-12-31 21:35:11 +0800
• 9663cf6682 首页时间 lzy-jay 2025-12-31 21:31:08 +0800
• afcc9f36a2 Merge remote-tracking branch 'origin/develop' into liuzy_branch lzy-jay 2025-12-31 21:24:50 +0800
• 231eda5740 修改了web个人主页的字体对齐问题以及屏幕缩小时菜单栏的放置问题 黄思慧 2025-12-31 21:06:40 +0800
• fbdd125ed0 修改了搜索栏的样式 黄思慧 2025-12-31 20:41:54 +0800
• 536ca9ff2d Merge pull request '修复' (#118) from xiexy_branch into develop hnu202326010206 2025-12-31 20:37:08 +0800
• c5b0c75f08 修复 hnu202326010206 2025-12-31 20:25:33 +0800
• f2d060cb86 Merge pull request '补交' (#117) from xiexy_branch into develop hnu202326010206 2025-12-31 20:15:31 +0800
• 4f567b46aa 补交 hnu202326010206 2025-12-31 20:04:50 +0800
• 5ca290aeaf 补交 hnu202326010206 2025-12-31 20:04:50 +0800
• df7fb3f88d Merge pull request '首页数据图' (#115) from liuzy_branch into develop hnu202326010221 2025-12-31 20:04:08 +0800
• 4446f66f67 Merge remote-tracking branch 'origin/develop' into liuzy_branch lzy-jay 2025-12-31 19:57:54 +0800
• 23f76f067a 首页数据图 lzy-jay 2025-12-31 19:57:30 +0800
• 3624836432 Merge pull request '他人糖友圈展示和动态统计' (#114) from xiexy_branch into develop hnu202326010206 2025-12-31 18:52:32 +0800
• 16d6e942a7 动态统计和他人全部糖友圈显示 hnu202326010206 2025-12-31 18:36:59 +0800
• 63a74b40ab Merge pull request '家庭邀请' (#113) from liuzy_branch into develop hnu202326010221 2025-12-31 18:36:41 +0800
• 4582422161 家庭邀请 lzy-jay 2025-12-31 18:19:31 +0800
• 59775017c6 统一了表格样式 黄思慧 2025-12-31 18:17:27 +0800
• 2e9ed65a6f Merge pull request '修正部分小程序页面样式' (#112) from pangqr_branch into develop hnu202326010206 2025-12-31 17:11:47 +0800
• a836228445 修正部分小程序页面的样式 YourName 2025-12-31 17:01:17 +0800
• ce7782ad89 Merge pull request '合并错误修复' (#111) from xiexy_branch into develop hnu202326010206 2025-12-31 16:59:08 +0800
• c1f7d07531 合并错误修复 hnu202326010206 2025-12-31 16:36:28 +0800
• 76a7ad2ccb Merge pull request '他人主页隐私显示' (#110) from xiexy_branch into develop hnu202326010206 2025-12-31 16:51:05 +0800
• 7e36a59d1c 他人主页 hnu202326010206 2025-12-31 16:36:28 +0800
• dfde236d22 Merge pull request '首页闹钟显示' (#108) from liuzy_branch into develop hnu202326010206 2025-12-31 11:11:24 +0800
• c547bf7525 首页闹钟显示 lzy-jay 2025-12-31 11:08:39 +0800
• 7e79b97ac4 Merge pull request '私信redis权限' (#107) from xiexy_branch into develop hnu202326010206 2025-12-31 02:31:41 +0800
• b116cd03fa 私信以及权限管理 hnu202326010206 2025-12-31 02:02:02 +0800
• 9df79ff63c Merge pull request '修正部分页面样式' (#106) from pangqr_branch into develop hnu202326010221 2025-12-31 00:43:05 +0800
• 230c9258a8 修正部分web页面的样式 YourName 2025-12-31 00:23:13 +0800
• d57c046fe4 Merge pull request '爬虫搜索前端' (#105) from tangxj_branch into develop hnu202326010216 2025-12-30 22:51:53 +0800
• a67dc765f3 爬虫和搜索（修复过前端） tangxj_branch txj 2025-12-30 22:46:26 +0800
• a59aeae4d6 添加批量生成管理员账号的功能 黄思慧 2025-12-30 22:01:24 +0800
• 48500bbd4b Merge pull request '首页轮播图' (#104) from liuzy_branch into develop hnu202326010221 2025-12-30 20:44:26 +0800
• 7cd695231f 首页轮播图 lzy-jay 2025-12-30 20:38:57 +0800
• e325b672e1 Merge pull request '首页轮播图' (#103) from liuzy_branch into develop hnu202326010221 2025-12-30 20:23:39 +0800
• b781f2a008 首页轮播图 lzy-jay 2025-12-30 20:21:18 +0800
• 725e67249c Merge pull request '举报管理与恶意用户百分比问题，提及系统管理充值密码角色等问题' (#102) from liuzy_branch into develop hnu202326010221 2025-12-30 19:53:29 +0800
• 2948d5cde9 举报管理与恶意用户百分比问题，提及系统管理充值密码角色等问题 lzy-jay 2025-12-30 19:48:35 +0800
• cafa138a04 Merge pull request '系统部分的通知功能' (#101) from pangqr_branch into develop hnu202326010221 2025-12-30 19:28:47 +0800
• 04bb3f91a5 系统部分的通知功能 YourName 2025-12-30 19:25:11 +0800
• 0f70ff3d1c 遗漏的文件 黄思慧 2025-12-30 19:16:44 +0800
• ef0f87a42a 初步实现了web个人主页的工作量统计、角色删除的问题、一些界面的弹窗 黄思慧 2025-12-30 15:45:25 +0800
• e1465cb0b1 Merge pull request '设备二维码功能' (#100) from liuzy_branch into develop hnu202326010221 2025-12-30 15:39:09 +0800
• 2f674c0ffb 设备二维码功能 lzy-jay 2025-12-30 15:36:58 +0800
• 9d525a82b3 Merge pull request '客户管理搜索' (#99) from xiexy_branch into develop hnu202326010221 2025-12-30 15:35:24 +0800
• 792d2013f3 客户管理搜索 hnu202326010206 2025-12-30 15:27:29 +0800
• 1ece1983da Merge pull request '知识百科与糖友圈帖子Redis' (#98) from liuzy_branch into develop hnu202326010221 2025-12-30 14:21:47 +0800
• 6201fc3034 知识百科与糖友圈帖子Redis lzy-jay 2025-12-30 14:20:28 +0800
• 839f0a2216 Merge pull request '修正糖友圈发布管理搜索功能' (#97) from pangqr_branch into develop hnu202326010221 2025-12-30 11:06:58 +0800
• 2b0f38dc52 修正糖友圈发布管理搜索功能 YourName 2025-12-30 11:04:25 +0800
• b9f405c37e Merge refs/remotes/origin/develop into refs/heads/pangqr_branch YourName 2025-12-30 10:17:52 +0800
• 6471b11294 修改web个人主页的编辑功能和修补添加/编辑角色的bug 黄思慧 2025-12-30 01:28:25 +0800
• a84a21e7a5 Merge pull request '两个搜索+样式+糖友圈修复功能' (#96) from tangxj_branch into develop hnu202326010216 2025-12-30 01:02:22 +0800