Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 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
• 19aa824bc6 添加党员认证、热心居民申请端访问权限控制 sunyuchao 2020-03-30 16:31:58 +0800
• e7b982a9d1 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 yinzuomei 2020-03-30 16:25:34 +0800
• 53a28d326a 新增initapplycreategroup接口 yinzuomei 2020-03-30 16:25:27 +0800
• aa52648f60 Merge remote-tracking branch 'origin/dev0.2' into dev0.2 wangchao 2020-03-30 16:20:24 +0800
• 21062aeea6 enterGrid相关 wangchao 2020-03-30 16:17:51 +0800
• 89e0e1ddd6 实体DTO字段名修改 sunyuchao 2020-03-30 16:17:48 +0800
• 94e6274613 根据app、用户Id、客户Id查询用户的角色列表。 wangchao 2020-03-30 16:15:57 +0800
• 5e1f5d4062 居民注册页面初始化注册访问记录表新增数据接口 sunyuchao 2020-03-30 15:49:03 +0800
• 391ad82af0 loginByWxCode、loginByPassword接口修改，删除customer_user相关代码 yinzuomei 2020-03-30 14:33:29 +0800
• 9956a4cd5f Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2 wangchao 2020-03-30 13:26:51 +0800
• 5fbd3029e2 用户entergrid wangchao 2020-03-30 12:53:24 +0800
• 59cce5e2e2 resi-group新增initapplygroup接口,epmet-user新增根据客户id、用户id查询居民注册信息接口 yinzuomei 2020-03-30 11:48:03 +0800
• d57edceed1 居民热心居民党员业务代码生成 sunyuchao 2020-03-30 10:31:12 +0800
• 1be49682d5 实现group部分接口,新增我的消息 yinzuomei 2020-03-29 21:44:40 +0800
• 3d857c5dbf auth的userFeign去掉url wangchao 2020-03-29 20:39:56 +0800
• 764615519b 居民用户微信登录接口修改 wangchao 2020-03-29 20:19:34 +0800
• 5e1f0b7c67 修改运营端登录接口，居民用户微信登录接口 wangchao 2020-03-29 19:48:39 +0800
• c0428dc9fd Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0 wangchao 2020-03-28 11:58:23 +0800
• e59f3077ed 新增resi-group,resi-partymember yinzuomei 2020-03-28 11:09:46 +0800
• 30f9bc2e0f demo模块修改 yinzuomei 2020-03-27 17:11:59 +0800
• b450c442f6 Merge branches 'dev1.0' and 'dev1.0-opercustomize' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-opercustomize yinzuomei 2020-03-27 16:42:23 +0800
• 79599584d3 redis连接改为10.10.10.77 yinzuomei 2020-03-25 15:12:55 +0800
• abf0965b54 命名规范修改 yinzuomei 2020-03-25 12:55:07 +0800
• 9863e1ca0c Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0 wangchao 2020-03-25 11:35:53 +0800
• a9f93217c4 登陆bug修改，获取网格信息bug修改 yinzuomei 2020-03-25 11:35:09 +0800
• 76b609a6b7 Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0 wangchao 2020-03-25 10:24:32 +0800
• 27ceea8e02 gateway pom.xml wangchao 2020-03-25 10:23:52 +0800
• 0684996bdd ResiMineGridController入口改为mygrid yinzuomei 2020-03-24 19:58:22 +0800
• 494f978601 gateway修改resimine服务地址 yinzuomei 2020-03-24 19:51:03 +0800
• 43f2b0f5c1 Merge branches 'dev1.0' and 'dev1.0-opercustomize' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-opercustomize yinzuomei 2020-03-24 18:11:33 +0800
• 22007969eb Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0 wangchao 2020-03-24 18:10:49 +0800
• 56a5ddb7af FeignClient去掉url wangchao 2020-03-24 18:10:44 +0800
• d8d86efa14 Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin yinzuomei 2020-03-24 18:09:31 +0800
• 12f23a770b 新增resi-mine yinzuomei 2020-03-24 18:08:16 +0800
• 8b7d8f37a7 Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0 wangchao 2020-03-24 17:36:46 +0800
• 4276d44c19 FeignClient去掉url wangchao 2020-03-24 17:36:30 +0800
• caec4b9e8f Merge remote-tracking branch 'origin/dev1.0' into dev1.0 wangchao 2020-03-24 15:53:16 +0800
• 65dea28661 新增修改数据方法 sunyuchao 2020-03-24 14:00:57 +0800
• c4cd37bca8 oper-access的pom.xml去掉多余注释 wangchao 2020-03-24 13:29:19 +0800
• 207b180398 resi-guide陌生人查询附近网格信息部分代码规范调整,将本地开发环境的redis库连接到远程主机10.10.10.79:6379 wangchao 2020-03-24 13:27:39 +0800
• 73e7898bb7 漏提代码 sunyuchao 2020-03-24 12:50:50 +0800
• 11a9c209c4 代码Review之后的修改 sunyuchao 2020-03-24 12:40:51 +0800
• 1064b9d9c5 release问题修改 hosinokamui 2020-03-24 12:15:09 +0800
• 7508f837c3 Merge branches 'dev1.0' and 'dev1.0-authlogin' of http://121.42.41.42:7070/r/epmet-cloud into dev1.0-authlogin yinzuomei 2020-03-23 22:44:15 +0800
• 63e879d1c1 新增首页组件管理 yinzuomei 2020-03-23 22:43:36 +0800
• e25b2207f5 菜单增删改查修改 hosinokamui 2020-03-23 14:53:11 +0800
• bf6b50967f Merge branches 'dev1.0' and 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide sunyuchao 2020-03-23 14:17:55 +0800
• fcb5b8ba6b 陌生人导览获取首页配置sql语句添加排序字段 sunyuchao 2020-03-23 14:15:50 +0800
• 2296cae1a5 菜单增删改查修改 hosinokamui 2020-03-23 13:54:42 +0800
• a2d9ac91b9 陌生人访问记录service/dao/mapper删除无用代码 wangchao 2020-03-23 10:48:13 +0800
• be483a46f4 Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0 wangchao 2020-03-23 10:26:40 +0800
• 3fa58ddc75 网格信息查询增加del_flag校验，陌生人访客记录的分页查询修改， wangchao 2020-03-23 10:26:00 +0800
• ad88e9692f Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-authlogin hosinokamui 2020-03-21 12:06:11 +0800
• cc3ab53151 Merge remote-tracking branch 'origin/dev1.0' into dev1.0 yangshaoping 2020-03-21 12:01:22 +0800
• eca6f3fe0d 添加and a.`STATUS`=1字段 yangshaoping 2020-03-21 12:00:52 +0800
• 74a39bf6dd Merge branches 'dev1.0' and 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide sunyuchao 2020-03-21 12:00:17 +0800
• ce6432bafa sql添加查询字段 sunyuchao 2020-03-21 11:57:04 +0800
• 9f47aa9ca0 Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-authlogin hosinokamui 2020-03-21 11:43:46 +0800
• 49a614cce2 用户和角色增删改查修改 hosinokamui 2020-03-21 11:42:32 +0800
• ad522ae17f CpAuthGatewayFilterFactory去除无用注释代码 wangchao 2020-03-21 11:38:49 +0800
• 4f65a1b8dc Merge branch 'dev1.0' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0 wangchao 2020-03-21 11:34:35 +0800
• 8f79cf0fa7 RenException增加构造方法new RenException(int code,String msg) wangchao 2020-03-21 11:34:15 +0800
• be62daa4c2 Merge branches 'dev1.0' and 'dev1.0-resiguide' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev1.0-resiguide sunyuchao 2020-03-21 10:39:19 +0800
• 33e3e67207 陌生人导览 修改参数取值问题 sunyuchao 2020-03-21 10:32:45 +0800
• 2dae4480e1 返回前段标识c.COMPONENT_FRONT_ID, yangshaoping 2020-03-21 09:27:19 +0800