Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• b9c1a74aa0 根据链接查询群组信息接口修改 yinzuomei 2020-04-07 18:01:51 +0800
• 2db955c7ed Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-04-07 17:43:42 +0800
• 4e999e2e0f 根据链接查询群组信息接口修改 yinzuomei 2020-04-07 17:43:33 +0800
• 73e313096a 消息查询和已读 zhaoqifeng 2020-04-07 17:42:47 +0800
• c8c8e78def 8006此链接已过期 yinzuomei 2020-04-07 16:31:46 +0800
• 63a6a127b0 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-04-07 16:27:24 +0800
• f67026cf89 添加消息通知 yinzuomei 2020-04-07 16:27:13 +0800
• 913ec56185 更新用户最近访问时，同事更新latestTime和updatedTime两个字段 wangchao 2020-04-07 16:17:10 +0800
• bd556f1ef5 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-04-07 15:51:51 +0800
• 933df5a0ef 接口名称修改，getlatesttentopics改成getlatesttopics，错误信息封装常量 wangchao 2020-04-07 15:49:14 +0800
• 17e88bf785 居民端-添加热心居民申请审核接口 sunyuchao 2020-04-07 14:59:41 +0800
• daa0689f26 添加 消息相关 zhaoqifeng 2020-04-07 14:28:56 +0800
• 6882ae4ef0 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-04-07 12:56:31 +0800
• 59195ae17a 上传图片接口 yinzuomei 2020-04-07 12:56:23 +0800
• dd41e5ea8d 居民端-居民注册信息提交程序优化 sunyuchao 2020-04-07 10:36:10 +0800
• 5a3078b656 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 sunyuchao 2020-04-07 09:55:57 +0800
• 06764ee33f 居民端-居民注册获取手机验证码 sunyuchao 2020-04-07 09:55:39 +0800
• ed32b4d246 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-04-07 09:54:46 +0800
• d7bc75c8ab 话题相关、评论相关增加FormDTO wangchao 2020-04-07 09:52:23 +0800
• a0e42049b4 我的小组sql修改 yinzuomei 2020-04-05 22:47:38 +0800
• eb3c481b0c 发送端新feign添加@PathVariable yinzuomei 2020-04-05 21:44:16 +0800
• 34740ac429 加入小组界面初始化接口修改 yinzuomei 2020-04-05 18:43:16 +0800
• cf47e97204 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-04-05 17:45:00 +0800
• 52d9334daf bug修改 yinzuomei 2020-04-05 17:44:43 +0800
• 7a8510ffc8 bug修改 zhaoqifeng 2020-04-03 18:39:49 +0800
• 4eea403e3a Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-04-03 17:27:14 +0800
• dcd471f510 更改参数注解 wangchao 2020-04-03 17:22:07 +0800
• 35d3c4393a message的pom文件加上<activation> wangchao 2020-04-03 17:03:25 +0800
• 264816ac21 messagepom修改 yinzuomei 2020-04-03 16:27:37 +0800
• df9d7706e5 opercrm误提 yinzuomei 2020-04-03 16:26:49 +0800
• 5f51e472e3 messagepom文件修改 yinzuomei 2020-04-03 16:25:50 +0800
• 49d5487046 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-04-03 15:57:29 +0800
• fdd17936fa Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-04-03 15:55:03 +0800
• 2d170e97b1 EpmetErrorCode修改 yinzuomei 2020-04-03 15:54:17 +0800
• 41e54b06a2 屏蔽话题修改 wangchao 2020-04-03 15:52:26 +0800
• a4e8dd826a Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wxz 2020-04-03 15:05:27 +0800
• c78d249769 短信验证码修改 wxz 2020-04-03 15:03:09 +0800
• d88bb0baca Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-04-03 14:59:22 +0800
• 78b719f93c message修改devnacos配置 yinzuomei 2020-04-03 14:59:09 +0800
• 1fb32bba5a Merge remote-tracking branch 'origin/dev0.2' into dev0.2 zhaoqifeng 2020-04-03 14:51:16 +0800
• 005f6465fb 党员认证获取短信验证码 zhaoqifeng 2020-04-03 14:51:00 +0800
• 7fb3a8bad0 我的小组groupLeaderFlag修改 yinzuomei 2020-04-03 14:50:10 +0800
• 635435461b Merge remote-tracking branch 'origin/dev0.2' into dev0.2 sunyuchao 2020-04-03 14:21:59 +0800
• 9af74f7e28 居民端-居民注册添加短信验证码服务 sunyuchao 2020-04-03 14:21:32 +0800
• 7bfa9812c5 修复：MessageFeignClient缺少@PathVariable注解 wxz 2020-04-03 11:21:16 +0800
• b3eb5fc271 居民端-居民注册、热心申请模块insert语句修改 使用系统insert方法 sunyuchao 2020-04-03 10:33:06 +0800
• ccab39a11d Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wxz 2020-04-03 10:19:24 +0800
• 98e7b6aa2f 修改：短信验证码接口，改为url传参。提供短信验证码接口的feign client wxz 2020-04-03 10:19:09 +0800
• cb5aae62ae 修改 认证成功后添加角色 hosinokamui 2020-04-03 09:52:08 +0800
• f285ae6fc5 Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wxz 2020-04-03 09:50:08 +0800
• 91948ce28c 修改：将message-server模块的feign client挪到了message-client模块 wxz 2020-04-03 09:49:50 +0800
• f18e1be322 Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wangchao 2020-04-03 09:40:12 +0800
• a059aa4ed7 话题、评论接口修改 wangchao 2020-04-03 09:39:10 +0800
• 3e89fb4b56 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 hosinokamui 2020-04-03 09:28:37 +0800
• a5c5026085 修改 党员认证提交 hosinokamui 2020-04-03 09:28:12 +0800
• 0470ded8c6 居民端-居民注册信息提交入参修改 sunyuchao 2020-04-03 09:26:01 +0800
• bb35320ee0 新增：短信验证码接口 修改：/message/sms/send接口，由表单形式修改为json形式 wxz 2020-04-02 23:03:23 +0800
• bb22079bec Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wxz 2020-04-02 17:53:18 +0800
• f41fc9b0a0 修复：新增EpmetBaseEntity update时机的自动填充 修改：去掉AuthFilter的@Configuration wxz 2020-04-02 17:52:34 +0800
• 0afa1ecd00 Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wangchao 2020-04-02 17:23:25 +0800
• 414eb97509 话题、评论接口修改，进入网格增加用户关系表的存在性校验 wangchao 2020-04-02 17:22:01 +0800
• ace875171d 修复：界面短信发送不能用的问题 wxz 2020-04-02 16:53:25 +0800
• a115b59638 api修改 hosinokamui 2020-04-02 15:46:32 +0800
• 9d066215e7 修改 认证成功后添加角色 hosinokamui 2020-04-02 14:25:57 +0800
• 5c6a50958a Merge remote-tracking branch 'origin/dev0.2' into dev0.2 hosinokamui 2020-04-02 14:23:08 +0800
• 7d87467f47 修改 认证成功后添加角色 hosinokamui 2020-04-02 14:18:19 +0800
• 6bf8ed658b partymember编译bug修改 yinzuomei 2020-04-02 14:17:59 +0800
• 86f301314b 居民端-角色添加合并代码 sunyuchao 2020-04-02 10:23:41 +0800
• aba13685f3 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 sunyuchao 2020-04-02 10:01:50 +0800
• fe4394a204 话题、评论相关接口 wangchao 2020-04-02 09:46:25 +0800
• 7a629c8000 居民端-居民注册添加角色信息 sunyuchao 2020-04-02 09:40:26 +0800
• cac04f939f Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wangchao 2020-04-02 09:36:14 +0800
• 3159b68152 话题、评论相关接口 wangchao 2020-04-02 09:31:07 +0800
• 7435c29f19 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-04-01 22:37:41 +0800
• 0c1b47f4ae 发送短信临时insertsql yinzuomei 2020-04-01 22:37:30 +0800
• 8fce3b0a30 认证成功后添加角色 hosinokamui 2020-04-01 18:16:15 +0800
• 1c4628601a Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-04-01 16:56:57 +0800
• 9396b33186 oss模块修改 yinzuomei 2020-04-01 16:56:51 +0800
• ad32d03765 居民端-热心居民申请模块接口逻辑调整 sunyuchao 2020-04-01 16:52:59 +0800
• 21e36c8aa3 新增 党员认证信息提交和党员认证信息补充功能 hosinokamui 2020-04-01 16:30:44 +0800
• 4f93a09803 去除@LogOperation,去除epmet-monitor-server yinzuomei 2020-04-01 16:09:16 +0800
• 1c6092f289 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-04-01 15:38:52 +0800
• 503f1454b9 message修改db连接epmet_message yinzuomei 2020-04-01 15:38:39 +0800
• 649e06d16a 居民端-居民注册根据手机号获取验证码 sunyuchao 2020-04-01 15:04:11 +0800
• 21769db26d partyMemberInfoDao.xml修正 hosinokamui 2020-04-01 11:18:35 +0800
• 95bb02bb23 话题相关代码2 wangchao 2020-04-01 10:43:24 +0800
• f60c49c010 居民端-居民注册信息提交接口-部分逻辑代码提交 sunyuchao 2020-04-01 10:38:13 +0800
• 3b406709a5 话题相关代码 wangchao 2020-04-01 10:21:03 +0800
• b52b1e5305 话题相关代码 wangchao 2020-04-01 10:01:14 +0800
• 0a96568035 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-04-01 09:29:33 +0800
• 560310c00a 修改配置文件 yinzuomei 2020-04-01 09:29:16 +0800
• d72d4242dd 新增接口：生成群链接、同意进群、根据邀请连接查询群基本信息v1 yinzuomei 2020-04-01 00:21:59 +0800
• 623676ee70 新增接口：生成群链接、同意进群、根据邀请连接查询群基本信息 yinzuomei 2020-04-01 00:19:42 +0800
• 45eb157324 selectOperUserInfoById入参改为user.id yinzuomei 2020-03-31 17:08:05 +0800
• eaf00d671c 申请入群增加校验避免重复申请 yinzuomei 2020-03-31 16:49:46 +0800
• e18a2e6116 测试代码提交 yinzuomei 2020-03-31 16:32:45 +0800
• e2c0ae6071 组长同意入群、拒绝入群接口添加校验 yinzuomei 2020-03-31 16:13:11 +0800
• d15cb49cac 热心居民申请-申请表新增数据、行为记录表更新数据 sunyuchao 2020-03-31 15:39:13 +0800
• 2437c6d252 话题相关，将评论也放进话题中 wangchao 2020-03-31 15:34:27 +0800
• 3296dceb6b topic相关dao去除resultMapv2 yinzuomei 2020-03-31 15:27:06 +0800