客户举报管理以及通知

81f6e6a9d1 添加历史数据切换成员功能

1d3c3cb4be Merge pull request '添加历史数据切换成员功能' (#21 ) from liuzy_branch into develop

191a1ef20d 项目文档

9f6d85d2ab 更新智能问答、监测计划、、知识百科页面

382ab4e9ff Merge pull request '更新智能问答、监测计划、知识百科页面' (#22 ) from pangqr_branch into develop

031d002033 添加血糖趋势图和历史数据的趋势图

76081494ea Merge pull request '添加血糖趋势图和历史数据的趋势图' (#23 ) from liuzy_branch into develop

6615d29c14 修改登录界面

82666c814b 修改json

f81bb91be4 增加日期选择，批量导入，优化趋势图等等

60838797b4 Merge pull request '增加日期选择，批量导入，优化趋势图等等' (#24 ) from liuzy_branch into develop

10d1d02321 新增web文件结构

a507f60281 增添添加家庭成员的搜索界面，将历史数据选择改为日历图标

4a64f100de Merge pull request '增添添加家庭成员的搜索界面，将历史数据选择改为日历图标' (#25 ) from liuzy_branch into develop

3f054c2024 初始提交：第9周文档

1595226bf9 初始提交：第9周文档

8612b5fcfb Merge refs/remotes/origin/develop into refs/heads/huangsh_branch

843f5994de Merge pull request '合并文档' (#26 ) from huangsh_branch into develop

d2463201dc Merge refs/remotes/origin/develop into refs/heads/huangsh_branch

d3e89bf3cc 初步整体美化了一下界面

07ffaa2213 Merge remote-tracking branch 'origin/develop' into huangsh_branch

0bb2ace802 个人页面和他人页面

1038ca7436 Merge pull request '合并个人主页' (#27 ) from xiexy_branch into develop

94f8230b07 轮播图与知识百科管理界面实现

ecc65315ef 轮播图与知识百科管理界面实现

dac7f96e49 Merge pull request '轮播图与知识百科管理界面实现' (#28 ) from liuzy_branch into develop

7783d33286 Merge refs/remotes/origin/develop into refs/heads/huangsh_branch

ff15bbb610 修复了个人主页中一个显示的bug

让个人信息能显示出来了

43606403cb

9fe2a1435e Merge pull request '修复了一个bug' (#29 ) from huangsh_branch into develop

0a9d731a41 跳转问题

a40b0de04e Merge pull request '跳转问题' (#30 ) from xiexy_branch into develop

aa25c265f7 糖友圈细节更新，还差顶部框

930a924674 外部知识库操作栏对齐

f4b4d789be Merge pull request '对齐' (#31 ) from liuzy_branch into develop

4df78621f2 糖友圈更新

还差顶部方框的美化，需与lzy协商

76ddabff9d Merge refs/remotes/origin/develop into refs/heads/tangxj_branch

3f50ba7319 家庭旁显示家庭码，且根据家庭码可以加入现有家庭

0cad92a97f Merge pull request '糖友圈更新' (#32 ) from tangxj_branch into develop

8e8751ee6b Merge refs/remotes/origin/develop into refs/heads/liuzy_branch

5b6bfeb4f1 合并文档

333296aa9b Merge refs/remotes/origin/develop into refs/heads/develop

37a9fc0e0b 修改web登录界面

8d4a9d7c4b Merge remote-tracking branch 'origin/develop' into liuzy_branch

df9c699d8c 设备管理中设备列表实现

f1fe21fb6e Update weekly-summary-04.md

9daf6545e9 Update weekly-summary-04.md

4ac8c43984 Update huangsihui-weekly-summary-04.md

eaf7efce28 Update liuzhongyu-weekly-summary-04.md

c9bf5be9e9 Update pangquanru-weekly-summary-04.md

8a0eba22ec Update tangxijun-weekly-summary-04.md

2341ff21cf Update xiexinyan-weekly-summary-04.md

f543942399 Update huangsihui-weekly-summary-05.md

c2b93ae803 Update huangsihui-weekly-summary-06.md

9da84d4f26 Merge pull request '设备管理中设备列表实现' (#33 ) from liuzy_branch into develop

b796072f25 Update weekly-summary-04.md

6055217161 Update liuzhongyu-weekly-plan-05.md

41c103afbd Update meeting-minutes-05.md

4ed931df45 Update meeting-minutes-04.md

ff248ed7b3 Update tangxijun-weekly-plan-06.md

b334979977 Update pangquanru-weekly-summary-04.md

b7109705ab Update xiexinyan-weekly-summary-04.md

a831b049a3 Update weekly-plan-04.md

071dc68360 Update huangsihui-weekly-summary-05.md

c8d57b0639 Update weekly-plan-05.md

860cc05a98 Update pangquanru-weekly-summary-08.md

9b99470530 Update weekly-plan-07.md

81f979a99d Update meeting-minutes-08.md

51aee20e6b Update meeting-minutes-09.md

5a33c90993 Update liuzhongyu-weekly-plan-10.md

bfa4a9eb16 客户管理和系统管理

d29f13414f Merge remote-tracking branch 'origin/develop' into xiexy_branch

b389928f2d Merge pull request 'web客户管理和系统管理' (#34 ) from xiexy_branch into develop

f9ff5495a4 新增后端代码框架

0634d2ad70 新增README文件

4849c3f047 在添加了TweetMapper中添加了函数框架

ce6d75664a 客户举报管理切换历史举报列表

b36e915895 Merge pull request '客户举报管理切换历史举报列表' (#35 ) from liuzy_branch into develop

15893d45d4 新增一些函数

35eefb33c1 新增一个函数

0fd078d3cc 新增了一些函数

747b24a74f 修改迭代开发计划第二稿

47cfcadec1 客户举报管理切换历史举报列表

dc08f0acde 修改管理员的角色为只有一个以符合原先数据库表的设计

d68b4f07bb 新增开发说明

f90c538df6 Merge pull request '客户举报管理切换历史举报列表' (#36 ) from liuzy_branch into develop

1eca7365b3 客户管理跳转问题和系统管理员工账号删除

25934ddbf7 Merge pull request '系统管理员工账号删除和客户管理跳转问题' (#37 ) from xiexy_branch into develop

afdf86fba6 轮播图web调整，后端health补充

94d512842a Merge pull request '轮播图web调整，后端health补充' (#38 ) from liuzy_branch into develop

2cc29bcd42 将timestamp的引入改成从java.sql.Timestamp引入

b96337774b Merge remote-tracking branch 'origin/develop' into develop

b0c6bc8f61 family微信小程序界面调整

16f022c5be Merge pull request 'family微信小程序界面调整' (#39 ) from liuzy_branch into develop

bd25c83ee0 family微信小程序界面再次调整

3a2777101b healthdata更新

2702a3b15f Merge pull request 'family微信小程序界面再次调整' (#40 ) from liuzy_branch into develop

b65cacffce update for pangqr_branch

cc0d1ff38b Merge pull request '小程序界面优化' (#41 ) from pangqr_branch into develop

475f2a4989 user

db0aff5fd6 Merge pull request 'user部分' (#42 ) from xiexy_branch into develop

5148e067f6 修改Mapper

a63f18d695 healthdata字段类型更新

4cd3f3a1b6 Merge pull request 'healthdata字段类型更新' (#43 ) from liuzy_branch into develop

91becd7b82 修改“本周任务计划安排”为“本周任务完成情况”

a3b029f5fc 提交第11周文档

fc8ff73f87 前端界面第一版更改

（通过第一次修改意见）

e7b4824338 Merge pull request '糖友圈web前端第一次修改' (#44 ) from tangxj_branch into develop

b797cbdcb6 更新device和monitor_plan

02dee5850d Merge pull request '更新device和monitor_plan' (#45 ) from pangqr_branch into develop

02728db8eb family字段更新，healthdata功能更新

a9685e2384 Merge pull request 'family字段更新，healthdata功能更新' (#46 ) from liuzy_branch into develop

61fd3addf4 user后端

a6787fee09 Merge pull request 'User后端填充' (#47 ) from xiexy_branch into develop

85e9b2d442 完善family实现

a1e89e8438 完善family实现

2371eff447 Merge pull request '完善family实现' (#48 ) from liuzy_branch into develop

2ff482c105 轮播图和知识百科web调整

56a0f04eb9 Merge pull request '修改了web界面的轮播图和知识库' (#49 ) from liuzy_branch into develop

a2bf32fb3e healthdata新增方法

218feb2d87 Merge pull request 'healthdata新增方法' (#50 ) from liuzy_branch into develop

f3d9ac25bb 更新device和monitor_plan

24c97df56c 庞铨如添加了新的依赖

1530373eba Merge remote-tracking branch 'origin/develop' into develop

8940a585bd Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

93e1ba3358 更新device和monitor_plan

59b60b9882 Merge pull request '更新device' (#51 ) from pangqr_branch into develop

e544e782b9 提交UML设计文档

15a359f8e9 Merge remote-tracking branch 'origin/develop' into develop

13f8cea5c1 提交controller示例

7bd6900c38 提交controller说明文档

eb7791fa75 修复一些根入口无法运行的问题

790d7c2879 添加了txj的knowledge模块中使用到的爬虫的依赖

c6b313bb63 healthdata的controller实现

1f47e317fb 修正adjust_plan.js

47c3d0237d Merge pull request '修正adjust_plan.js' (#52 ) from pangqr_branch into develop

4b3bfeab9f Merge remote-tracking branch 'origin/develop' into liuzy_branch

ce08bae5a9 user和admin

b95ff7d071 Merge pull request 'user和admin' (#53 ) from xiexy_branch into develop

be166d22a7 Merge remote-tracking branch 'origin/develop' into liuzy_branch

61bf35015a knowledge包第一次提交

4be9d3ba5f Merge refs/remotes/origin/develop into refs/heads/tangxj_branch

7438640b89 修改小程序部分的monitor.js、app.js进行前后端本地链接的尝试

1d8a12da81 Merge remote-tracking branch 'origin/develop' into develop

6f01d2c69a Merge pull request 'knowledge第一次提交' (#55 ) from tangxj_branch into develop

8911ed42af Merge remote-tracking branch 'origin/develop' into liuzy_branch

25c86ac84f user部分

03189f36de Merge pull request 'user部分' (#56 ) from xiexy_branch into develop

239afa69aa Merge remote-tracking branch 'origin/develop' into liuzy_branch

ecfe8e3e09 healthdata的controller实现以及family.js更新

154af1a334 添加监测计划控制器，更新设备管理和知识页面功能

2e13c1c577 Merge pull request '添加监测计划控制器，修正知识百科小程序页面' (#58 ) from pangqr_branch into develop

7b06840f82 family与healthdata的controller实现，family.js完善

7d26fad18c Merge remote-tracking branch 'origin/liuzy_branch' into liuzy_branch

# Conflicts:
#	src/user_service/src/main/resources/mapper/FamilyMapper.xml
#	src/wx_app/pages/family/family.js

55da6fe8d8 Merge pull request 'family与healthdata的controller实现，family.js完善' (#59 ) from liuzy_branch into develop

6985fde5fa 首页轮播图

d923c94d8f Merge pull request '首页轮播图' (#60 ) from liuzy_branch into develop

cbe62ded50 新增web的js

7de106c309 Merge remote-tracking branch 'origin/develop' into develop

9f2021d9a7 添加api文件夹

0bd74e9dc7 小程序健康数据记录、小程序家庭、web管理员查看设备的历史数据的前后端连接

39220e214a Merge pull request '小程序健康数据记录、小程序家庭、web管理员查看设备的历史数据的前后端连接' (#61 ) from liuzy_branch into develop

77a1d74d45 第12周文档

7be5ba86c0 实现web的登录

b45f009bef 实现小程序的登录

e63a5b2c3d 修改pom.xml配置

fbbb0e5967 family与history界面优化

ee5f188bf3 Merge pull request 'family与history界面优化' (#62 ) from liuzy_branch into develop

88ed4c5b9e knowledge包前后端连接第一次上传

8124355c70 Merge pull request 'knowledge前后端连接第一次提交' (#63 ) from tangxj_branch into develop

ae3dbc7d7f 客户管理和微信小程序的前后端连接

a6b5087075 web和微信个人主页

d0e44149a6 family与history界面优化

53a3f6719f Merge pull request 'web客户管理和微信个人页面' (#64 ) from xiexy_branch into develop

3928310990 Merge pull request 'family与history界面优化' (#65 ) from liuzy_branch into develop

fcea8a5d58 Merge pull request 'web和微信个人' (#66 ) from xiexy_branch into develop

5121b3a280 新增cors配置

1af68b1eb4 family与history优化

d3344ca676 Merge pull request 'family与history优化' (#67 ) from liuzy_branch into develop

f717b64781 设备、监测计划、系统管理后端完善

849118ff07 Merge pull request '设备、监测计划、系统管理后端完善' (#68 ) from pangqr_branch into develop

36991f42a9 新增配置已适应服务器

549c08362c 遗漏的部署文件

e077281d9d 遗漏的部署文件

af1afee22c 修改域名

8d4c28ce59 添加数据库建表语句

bce37b23af 添加数据库建表语句

e41f7f2929 更新部署

10593656c0 web客户管理和web小程序个人主页

d94cc4059c Merge pull request 'web客户管理和微信web个人页面' (#69 ) from xiexy_branch into develop

f7c7b3f2b4 family与index优化

8e5680f203 Merge pull request 'family与index优化' (#70 ) from liuzy_branch into develop

7a7edda4a6 family优化

d3a01bbdc2 Merge pull request 'family优化' (#71 ) from liuzy_branch into develop

6256eb21b7 history优化

6e6013e4ab Merge pull request 'history优化' (#72 ) from liuzy_branch into develop

9b3edad32e history与family优化

f0ae4cb1a7 Merge pull request 'history与family优化' (#73 ) from liuzy_branch into develop

dc5ade5ac7 设备、系统管理后端完善

384093ad20 Merge pull request 'web页面设备、系统管理改善' (#74 ) from pangqr_branch into develop

ef0922fc58 login修改，family显示我，invite不能邀请自己

be26e053b2 Merge pull request 'login修改，family显示我，invite不能邀请自己' (#75 ) from liuzy_branch into develop

821fd02ff0 更新

78c2e02459 系统管理分页格式与活跃用户统计

6c1d0f6022 Merge pull request '系统管理分页格式以及用户活跃统计' (#76 ) from xiexy_branch into develop

5815dde646 history日期问题以及切换数据问题

b88f2db284 Merge pull request 'history日期问题以及切换数据问题' (#77 ) from liuzy_branch into develop

db94e34301 知识百科+推文小程序界面修改

6e8d62ce5f 提交第13周文档

5a9ee64699 Merge pull request '小程序知识百科+推文详情前端界面修改' (#78 ) from tangxj_branch into develop

7c251b10fa 手动导入添加范围

fe2d45e41d Merge pull request '手动导入添加范围' (#79 ) from liuzy_branch into develop

b0dd3f7b2d 举报管理，恶意用户管理

80a31c1241 Merge pull request '举报管理，恶意用户管理' (#80 ) from liuzy_branch into develop

30066e4acc 迭代开发计划第三稿（最终稿）

39db9d368e 第二次小班课的UI走查准备

f4e5ee4886 修改web看不见上传的轮播图图片的问题，修改统计活跃用户的逻辑

4380c417cc 少上传了一个css文件

a1d86c9320 需求规格说明书最终稿

dfd9320b21 客户举报与恶意用户

82bdb279df Merge pull request '客户举报与恶意用户' (#81 ) from liuzy_branch into develop

e3ab8f038c 小程序糖友圈浏览和提醒中心修改

没有做发布和举报

e76a6a083a Merge pull request '小程序糖友圈浏览+消息提醒中心' (#82 ) from tangxj_branch into develop

00e06c6508 糖友圈发布管理、举报管理后端代码

ef1de0c9ee Merge pull request '糖友圈发布管理、举报管理后端代码' (#83 ) from pangqr_branch into develop

fa36a1960f 智能问答部分

70dcefe0a5 post部分代码改正

b9fb7ae926 Merge pull request 'post部分代码改正' (#84 ) from pangqr_branch into develop

9dc122e54d 糖友圈发布管理web页面修正

d9f443c366 Merge pull request '糖友圈发布管理页面显示修正以及查看帖子图片' (#85 ) from pangqr_branch into develop

33c6819d78 修正CircleWebConfig.java

742668f7c0 Merge pull request '修正CircleWebConfig.java' (#86 ) from pangqr_branch into develop

86910b3c6f 智能问答部分增加Elasticsearch和Redis部分

84f5bc9f02 智能问答部分增加Elasticsearch和Redis部分

8a8e70d7d8 Elasticsearch和Redis停止启动服务的脚本

b52dafec04 第14周文档

706fdb4822 少传的Redis配置文件

56658e6395 小程序个人糖友圈和他人主页完善

2d42cfea2d Merge refs/remotes/origin/develop into refs/heads/xiexy_branch

ef9e8402fd Merge pull request '个人糖友圈和他人主页完善' (#87 ) from xiexy_branch into develop

dea0147ae8 举报与恶意用户search

bb02a77bd3 Merge pull request '举报与恶意用户search' (#88 ) from liuzy_branch into develop

f9f59bbcc6 前端界面缩放

5605effbc4 Merge pull request '前端界面缩放' (#89 ) from liuzy_branch into develop

62c659ec83 智能审核API+糖友圈微信小程序功能修复

评论发送按钮变蓝，分享，私密公开状态变化

74700bfd40 Merge refs/remotes/origin/develop into refs/heads/tangxj_branch

c039c733b9 前端界面修复

4a407031c5 Merge pull request '前端界面修复' (#90 ) from liuzy_branch into develop

361c31e5fc Merge pull request 'API接入+糖友圈小程序功能修复' (#91 ) from tangxj_branch into develop

7bc418eb86 实现暂停

58d26516d5 Merge pull request '实现审核暂停' (#92 ) from tangxj_branch into develop

24ff9249db 糖友圈举报管理等

6f0071bf9f Merge pull request '糖友圈举报管理等' (#93 ) from liuzy_branch into develop

b2057660e4 实现小程序登录时自动获取微信号

9c7f0ba256 删除注册和找回密码功能

3713c38113 修复web界面上方出现白色栏的问题

c31e2ccf0a 修复web个人主页输入信息为空也能保存的问题、去除姓名密码登录的功能（为了防止出现管理员同名的情况）

6aa18b4897 修复web登录失败没有消息通知的问题、修复web个人主页一直显示同一个人的信息的问题

b93ccd10db 提交：第15周文档

53ffafdf4b 恶意用户管理样式

2c0be1a2ea 糖友圈发布管理、设备管理增加elasticsearch及部分功能改正

d45baac4e4 Merge pull request '恶意用户管理样式' (#94 ) from liuzy_branch into develop

b987453280 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

91ad0d8dc0 Merge pull request '糖友圈发布管理、设备管理接入elasticsearch以及部分功能修正' (#95 ) from pangqr_branch into develop

f477d55846 数据库+前端样式

be4a45b5da 知识库搜索

a84a21e7a5 Merge pull request '两个搜索+样式+糖友圈修复功能' (#96 ) from tangxj_branch into develop

6471b11294 修改web个人主页的编辑功能和修补添加/编辑角色的bug

b9f405c37e Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

2b0f38dc52 修正糖友圈发布管理搜索功能

839f0a2216 Merge pull request '修正糖友圈发布管理搜索功能' (#97 ) from pangqr_branch into develop

6201fc3034 知识百科与糖友圈帖子Redis

1ece1983da Merge pull request '知识百科与糖友圈帖子Redis' (#98 ) from liuzy_branch into develop

792d2013f3 客户管理搜索

9d525a82b3 Merge pull request '客户管理搜索' (#99 ) from xiexy_branch into develop

2f674c0ffb 设备二维码功能

e1465cb0b1 Merge pull request '设备二维码功能' (#100 ) from liuzy_branch into develop

ef0f87a42a 初步实现了web个人主页的工作量统计、角色删除的问题、一些界面的弹窗

0f70ff3d1c 遗漏的文件

04bb3f91a5 系统部分的通知功能

cafa138a04 Merge pull request '系统部分的通知功能' (#101 ) from pangqr_branch into develop

2948d5cde9 举报管理与恶意用户百分比问题，提及系统管理充值密码角色等问题

725e67249c Merge pull request '举报管理与恶意用户百分比问题，提及系统管理充值密码角色等问题' (#102 ) from liuzy_branch into develop

b781f2a008 首页轮播图

e325b672e1 Merge pull request '首页轮播图' (#103 ) from liuzy_branch into develop

7cd695231f 首页轮播图

48500bbd4b Merge pull request '首页轮播图' (#104 ) from liuzy_branch into develop

a59aeae4d6 添加批量生成管理员账号的功能

a67dc765f3 爬虫和搜索（修复过前端）

d57c046fe4 Merge pull request '爬虫搜索前端' (#105 ) from tangxj_branch into develop

230c9258a8 修正部分web页面的样式

9df79ff63c Merge pull request '修正部分页面样式' (#106 ) from pangqr_branch into develop

b116cd03fa 私信以及权限管理

7e79b97ac4 Merge pull request '私信redis权限' (#107 ) from xiexy_branch into develop

c547bf7525 首页闹钟显示

dfde236d22 Merge pull request '首页闹钟显示' (#108 ) from liuzy_branch into develop

7e36a59d1c 他人主页

c1f7d07531 合并错误修复

76a7ad2ccb Merge pull request '他人主页隐私显示' (#110 ) from xiexy_branch into develop

ce7782ad89 Merge pull request '合并错误修复' (#111 ) from xiexy_branch into develop

a836228445 修正部分小程序页面的样式

2e9ed65a6f Merge pull request '修正部分小程序页面样式' (#112 ) from pangqr_branch into develop

59775017c6 统一了表格样式

4582422161 家庭邀请

63a74b40ab Merge pull request '家庭邀请' (#113 ) from liuzy_branch into develop

16d6e942a7 动态统计和他人全部糖友圈显示

3624836432 Merge pull request '他人糖友圈展示和动态统计' (#114 ) from xiexy_branch into develop

23f76f067a 首页数据图

4446f66f67 Merge remote-tracking branch 'origin/develop' into liuzy_branch

df7fb3f88d Merge pull request '首页数据图' (#115 ) from liuzy_branch into develop

5ca290aeaf 补交

4f567b46aa 补交

f2d060cb86 Merge pull request '补交' (#117 ) from xiexy_branch into develop

c5b0c75f08 修复

536ca9ff2d Merge pull request '修复' (#118 ) from xiexy_branch into develop

fbdd125ed0 修改了搜索栏的样式

231eda5740 修改了web个人主页的字体对齐问题以及屏幕缩小时菜单栏的放置问题

afcc9f36a2 Merge remote-tracking branch 'origin/develop' into liuzy_branch

9663cf6682 首页时间

d262ec2179 Merge pull request '首页时间' (#119 ) from liuzy_branch into develop

5a69f2b4a9 后端输出删除

dd3d38d69f 后端输出删除

c7bde7b3c4 Merge pull request '后端输出删除' (#120 ) from xiexy_branch into develop

bc816a8cb5 小程序端从设备导入数据实现

37f6ea4f75 Merge pull request '小程序端从设备导入数据实现' (#121 ) from liuzy_branch into develop

22a70a5929 编辑资料不允许设置空值的修复

7575254388 编辑资料修复

05386ee43a Merge refs/remotes/origin/develop into refs/heads/xiexy_branch

f0f6027654 编辑资料修复

9b72459510 修正小程序监测计划和web知识百科管理的样式

99c0446b7b Merge pull request '修正小程序监测计划和web知识百科管理的样式' (#123 ) from pangqr_branch into develop

69b9c3b8f5 Merge pull request '编辑资料不能为空值的修复' (#124 ) from xiexy_branch into develop

65ed4fd83f 二维码

bc53a90ba5 Merge pull request '二维码' (#125 ) from liuzy_branch into develop

ffe8c086fb 家庭

754b5e70f6 Merge remote-tracking branch 'origin/develop' into liuzy_branch

a21284be50 Merge pull request '家庭' (#126 ) from liuzy_branch into develop

05668db0dd 家庭邀请

fcb20cecc1 Merge pull request '家庭邀请' (#127 ) from liuzy_branch into develop

fe848487ed 在web个人主页添加修改密码的功能

2ab4cd7398 修复微信小程序退出登录的功能

6e143b086a 私信修复

1716a4a253 Update AdminService.java

c9c9db953f Merge pull request '私信修改' (#129 ) from xiexy_branch into develop

9a58a474c6 恶意用户

28baee2eda Merge remote-tracking branch 'origin/develop' into liuzy_branch

e54408dd8b Merge pull request '恶意用户' (#130 ) from liuzy_branch into develop

ece4bcc2a7 Redis

06267fa64b Merge pull request 'Redis' (#131 ) from liuzy_branch into develop

eb5c7a6398 修复

e4cdfe2131 Merge refs/remotes/origin/develop into refs/heads/xiexy_branch

723ebb7e73 隐私设置和编辑资料

8828802bc7 Merge pull request '资料编辑和隐私设置' (#132 ) from xiexy_branch into develop

cbc36964f6 举报用户

2137f6a7b5 Merge pull request '举报用户' (#133 ) from xiexy_branch into develop

d368cde7cb 修正糖友圈发布管理、糖友圈举报管理、设备管理

ec213e7e65 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

ad0d854a34 Merge pull request '修正糖友圈发布管理、糖友圈举报管理、设备管理' (#134 ) from pangqr_branch into develop

3bd086028d 修改他人个人主页按钮位置

a931234790 修改web个人主页修改密码弹窗图层问题

04ea4966d3 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

ba56228747 修正糖友圈举报管理、设备管理

180514ebee Merge pull request '修正糖友圈举报管理、设备管理' (#135 ) from pangqr_branch into develop

750fb9b803 小程序设备导入数据修复

5cfa7407d7 Merge pull request '小程序设备导入数据修复' (#136 ) from liuzy_branch into develop

3a0f3fca10 修正糖友圈发布管理

3398745b58 Merge pull request '修正糖友圈发布管理' (#137 ) from pangqr_branch into develop

8f1f675611 修正糖友圈发布管理通知样式

b61d6c5897 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

daf1bc4326 Merge pull request '修正糖友圈发布管理的通知样式' (#138 ) from pangqr_branch into develop

ea0c96d44b 家庭邀请部分以及首页数据图

86bc906aef Merge remote-tracking branch 'origin/develop' into liuzy_branch

12a5a7d78a 修复糖友圈帖子审核通过后没有生成redis缓存的问题

293efba04f Merge pull request '家庭邀请部分以及首页数据图' (#139 ) from liuzy_branch into develop

44c80c0a35 Merge remote-tracking branch 'origin/develop' into liuzy_branch

0bebefbaba 修复web界面刷新时顶部栏显示”欢迎您，加载中“的问题

538a14d74b Merge remote-tracking branch 'origin/develop' into liuzy_branch

67122e6541 轮播图界面

0e7b5881f7 Merge pull request '轮播图界面修复' (#140 ) from tangxj_branch into develop

2f831a7733 Merge remote-tracking branch 'origin/develop' into liuzy_branch

4d998bf46a 修复个人主页、他人主页的动态统计错误问题

409044cacf Merge remote-tracking branch 'origin/develop' into liuzy_branch

ac76d4a9df 修复在帖子详情界面无法删除帖子的问题，并且在帖子详情界面添加点击头像跳转到个人主页的功能

d27d88f35f Merge remote-tracking branch 'origin/develop' into liuzy_branch

dbe639c002 私信和客户管理的格式

e8bc3c535d Merge pull request '客户管理和私信格式' (#141 ) from xiexy_branch into develop

f06ddc8f1a Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

fd7bc478e4 Merge remote-tracking branch 'origin/develop' into liuzy_branch

71283ccef5 糖友圈bug和redis缓存

812a663b04 字数限制修复

d3fa416512 Merge pull request '糖友圈bug' (#142 ) from tangxj_branch into develop

4babf56d69 Merge remote-tracking branch 'origin/develop' into liuzy_branch

b700686549 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

c1295799ff 修正代码

e400f7c8df Merge pull request '修正小程序监测计划、智能问答，web端糖友圈发布管理、举报管理、设备管理' (#143 ) from pangqr_branch into develop

b7af7259f3 Merge remote-tracking branch 'origin/develop' into liuzy_branch

3e6b116817 系统管理弹窗及删去轮播图管理

2713be0b3a Merge pull request '系统管理弹窗及删去轮播图管理' (#144 ) from liuzy_branch into develop

a9f0719e0d 界面搜索框、提示词修改

003957b432 Merge pull request '糖友圈WEB搜索、提示词修复' (#145 ) from tangxj_branch into develop

ae342a9d9e 恶意用户搜索以及去掉状态

e4baaabf79 再次修复系统管理无法删除角色的问题、修复登录后显示“欢迎您，加载中”的问题

dbbc259b5b Merge remote-tracking branch 'origin/develop' into develop

ec845d4aaa Merge remote-tracking branch 'origin/develop' into liuzy_branch

# Conflicts:
#	src/web_frontend/src/views/CircleMaliciousView.vue

8db773b415 恶意用户搜索以及去掉状态

71ce6d401b Merge pull request '恶意用户搜索以及去掉状态' (#147 ) from liuzy_branch into develop

9767b54707 修正设备管理的样式

a32cd522b6 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

e4c8575c8c Merge pull request '设备管理样式' (#148 ) from pangqr_branch into develop

e95b824315 客户管理搜索框修复

337484b71e Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

e9bd4e786d Merge pull request '恶意用户搜索框修复' (#149 ) from tangxj_branch into develop

18d2a4c014 修正设备管理的样式

c414ce62fa Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

fcd5318e2e Merge pull request '设备管理页面自适应' (#150 ) from pangqr_branch into develop

d75e6e2552 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

171445e1dd 昨天修改顶部栏少上传的文件

2355438aae Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

58844e8d47 设备管理搜索弹窗

73d36915fb Merge pull request '设备管理搜索弹窗' (#151 ) from liuzy_branch into develop

fcdc65b8a0 增加密码加密存储

49b2d47866 配置文件

a722fe15b5 Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

98a3cc6138 客户管理和举报详情页面

77628cddb3 Merge pull request '客户管理和举报详情页面' (#152 ) from xiexy_branch into develop

7a4b85460a Merge refs/remotes/origin/develop into refs/heads/pangqr_branch

14e33084f9 修正糖友圈发布管理

19698a05a0 Merge pull request '修正糖友圈发布管理' (#153 ) from pangqr_branch into develop

06aa28c3cb 客户举报管理以及通知

客户举报管理以及通知 #154