elink-star
/
epmet-cloud-zhengwu-yantai
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 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
  • 82e0a74d2f topic相关dao去除resultMap yinzuomei 2020-03-31 15:25:52 +0800
  • 95376d0ceb Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-03-31 15:12:37 +0800
  • e3cc62059e 待审核成员列表新增status返参：审核中 - under_auditting、审核通过 - approved、入群被拒 - rejected 、 yinzuomei 2020-03-31 15:11:08 +0800
  • 9135f07b4e enterGrid修改，增加user_customer wangchao 2020-03-31 15:08:22 +0800
  • c4fa935836 入群申请接口添加校验，避免重复申请 yinzuomei 2020-03-31 14:57:23 +0800
  • 13e170121f 群成员列表返参DTO修改memberId yinzuomei 2020-03-31 14:42:15 +0800
  • a62b3bc3ab 推荐小组接口sql修改 yinzuomei 2020-03-31 14:32:01 +0800
  • acb2f76b0a 新增拒绝群申请，后期会放到政府端，目前测试用 yinzuomei 2020-03-31 13:25:01 +0800
  • b7a1c37aef 新增网格长审核群申请接口-用来测试 yinzuomei 2020-03-31 13:14:30 +0800
  • 5861129244 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-03-31 12:21:33 +0800
  • 2543fa1b28 创建群接口修改 yinzuomei 2020-03-31 12:21:24 +0800
  • 18e3a16d04 Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wangchao 2020-03-31 12:01:56 +0800
  • c60d4727e7 话题相关文件 wangchao 2020-03-31 12:00:54 +0800
  • f28d84f968 新增党员认证页面初始化和获取手机验证码功能 hosinokamui 2020-03-31 11:21:42 +0800
  • 0205356fb2 解决Git服务误删、错提文件问题 sunyuchao 2020-03-31 11:03:07 +0800
  • e3182f4a15 热心居民申请页面初始化-查询是否已申请以及行为记录表新增数据 sunyuchao 2020-03-31 10:40:44 +0800
  • 914972e87e Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-03-31 10:29:05 +0800
  • 0c8e666f6b 进入网格相关代码2 wangchao 2020-03-31 10:26:11 +0800
  • 96107b6034 Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 sunyuchao 2020-03-31 10:12:51 +0800
  • 208ef6d5b6 热心居民申请页面初始化-查询是否已申请以及行为记录表新增数据 sunyuchao 2020-03-31 10:12:13 +0800
  • bb3e7d2237 EpmetErrorCode修改 yinzuomei 2020-03-31 09:22:31 +0800
  • ac1a0cb579 Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wangchao 2020-03-31 09:08:47 +0800
  • 2c06ecd592 进入网格相关代码 wangchao 2020-03-31 09:07:36 +0800
  • 15fe632a3d Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-03-30 23:01:39 +0800
  • 074c07ef3f 新增群成员列表、待审核成员列表、同意入群、拒绝入群 yinzuomei 2020-03-30 23:01:31 +0800
  • aba2e9f711 Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 sunyuchao 2020-03-30 17:47:19 +0800
  • 57f2a372ca 代码生成xml文件路径错误修改问题 sunyuchao 2020-03-30 17:46:56 +0800
  • 1ffd94f545 EpmetErrorCode待确认 yinzuomei 2020-03-30 17:43:15 +0800
  • dce760417e 公参拼写错误修改 sunyuchao 2020-03-30 17:24:24 +0800
  • cbbad312d0 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-03-30 17:12:10 +0800
  • beaf0b893a Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-03-30 17:09:48 +0800
  • b212fcac0d Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-03-30 17:09:29 +0800
  • 9628b46793 新增EpmetErrorCode、EpmetRoleKeyConstant yinzuomei 2020-03-30 17:09:23 +0800
  • f9bec86c6b UserAccessService wangchao 2020-03-30 17:07:25 +0800
  • d23c8ffc93 Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 sunyuchao 2020-03-30 16:32:26 +0800