Commit Graph

Select branches

Hide Pull Requests

dev

master

Mono Color

• bc90dcd82d fix：居民信息导出-gridIds wxz 2023-04-06 16:15:48 +0800
• d4525b4e53 柱子 yinzuomei 2023-04-06 16:12:52 +0800
• 9d4aa553be fix：居民信息导出-staffOrgPaths wxz 2023-04-06 16:01:47 +0800
• 2f22870337 代码写法调整，不重要 wxz 2023-04-07 10:00:41 +0800
• e731e686b8 fix:解决居民信息多选导致的一系列问题。。。。头发掉光了 wxz 2023-04-07 03:02:15 +0800
• 14fa4f64a1 fix：初始化"指挥调度"的时候，将sql中缺少的字段补全 wxz 2023-04-06 16:41:06 +0800
• 4ab42c4dc1 kaishijieshu yinzuomei 2023-04-06 15:56:15 +0800
• 8bb9e3efd2 修改：居民信息-所属房屋(小区列表)，根据所属组织调整为多选，将接口也修改为支持agencyIds/gridIds wxz 2023-04-06 15:20:21 +0800
• d764bd8db1 kaishijieshu yinzuomei 2023-04-06 14:55:12 +0800
• 6d3496d78a Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-04-06 14:39:55 +0800
• c59a56e09b level yinzuomei 2023-04-06 14:39:15 +0800
• c84d31ea7e 补充YanTaiTripReportSyncProcessor的@Component wxz 2023-04-06 14:29:36 +0800
• 896f6d9925 Merge branch 'master' into yantai_zhengwu_master wxz 2023-04-06 14:27:28 +0800
• 8dc146eb80 Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master wxz 2023-04-06 14:27:21 +0800
• a8d531ea20 Merge branch 'wxz_bug_fix' wxz 2023-04-06 14:26:36 +0800
• 784551dd0b 修复:1.ic_event，事件处理分析查询中，缺少del_flag='0'的bug wxz 2023-04-06 14:12:25 +0800
• 4a3b8375f1 level yinzuomei 2023-04-06 14:09:00 +0800
• 4a04905845 Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-04-06 13:40:46 +0800
• bee178b830 查询市级账号/区县级账号/镇街级账号/社区级账号登录次数 yinzuomei 2023-04-06 13:14:51 +0800
• 36ca5271b6 插入登录日志记录test yinzuomei 2023-04-04 16:46:37 +0800
• d646c1244b staff_login_log yinzuomei 2023-04-04 15:47:20 +0800
• 3cf4164990 Merge remote-tracking branch 'origin_elink/房屋tree_yzm' yinzuomei 2023-04-04 15:05:04 +0800
• aaaad8ce70 Merge remote-tracking branch 'origin/房屋tree_yzm' yinzuomei 2023-04-04 15:00:07 +0800
• 87a8ad5fc8 登录或者退出content不一致 yinzuomei 2023-04-04 14:19:41 +0800
• 5fc944ea3e Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-04 14:10:13 +0800
• 562cf269ea Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master yinzuomei 2023-04-04 14:07:34 +0800
• 489447af99 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-04 11:00:02 +0800
• 0af33c7ad2 烟台徽章认证，不校验验证码 yinzuomei 2023-04-04 10:51:30 +0800
• 5d242ab0e4 /resi/mine/badge/operlist，已申请，未审核通过的，"isCertificated": "no" yinzuomei 2023-04-04 10:46:57 +0800
• bd77c7f4e3 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-04-04 09:36:45 +0800
• 53584a65b6 /resi/mine/badge/operlist返回状态 yinzuomei 2023-04-04 09:12:01 +0800
• 2a01e968b2 /resi/mine/badge/operlist返回时间和状态 yinzuomei 2023-04-03 17:30:06 +0800
• 490390f9fc /resi/mine/badge/operlist返回时间和状态 yinzuomei 2023-04-03 17:05:51 +0800
• a5732972bb 补充 曲树通 2023-03-31 09:36:37 +0800
• eb45fd83cb 补充 曲树通 2023-03-31 09:03:50 +0800
• 6c3e466a28 Merge remote-tracking branch 'origin/master' yinzuomei 2023-03-30 18:45:08 +0800
• 87de538074 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-03-30 18:44:23 +0800
• 21ef3f3880 Merge branch 'feature/evaluate' 曲树通 2023-03-30 18:19:44 +0800
• d09b57d096 群众满意度关联联建单位 曲树通 2023-03-30 18:02:03 +0800
• eda98517e2 文化程度、民族缓存key调整 yinzuomei 2023-03-30 14:43:34 +0800
• cca2afca31 /heart/icpartyactivity/search yinzuomei 2023-03-30 10:38:33 +0800
• 78be98f049 /heart/icpartyactivity/search yinzuomei 2023-03-30 10:34:09 +0800
• dabf87287f 已报名 yinzuomei 2023-03-30 09:25:54 +0800
• 1eeb5609ad baoming列表 yinzuomei 2023-03-29 17:42:59 +0800
• 082efc4387 baoming列表 yinzuomei 2023-03-29 17:42:04 +0800
• 2c1acc7af8 报名总人数 yinzuomei 2023-03-29 16:58:04 +0800
• c391c1c782 报名联建活动 yinzuomei 2023-03-29 16:34:03 +0800
• 5f42552eaa 报名联建活动 yinzuomei 2023-03-29 15:49:36 +0800
• 5af9229dea 人员名单 yinzuomei 2023-03-29 14:12:40 +0800
• 5dd8aeb23b 人员名单 yinzuomei 2023-03-29 13:55:25 +0800
• a5969a4ec3 联建活动导入模板增加时间 yinzuomei 2023-03-29 12:47:04 +0800
• d335ac2e6c 联建活动时间查询 yinzuomei 2023-03-29 10:40:22 +0800
• 6c6cb6809a 联建活动，导入模板调整，导出调整。 yinzuomei 2023-03-29 10:37:42 +0800
• 4e282fba1b 联建活动增加：活动结束时间、活动封面。 yinzuomei 2023-03-29 10:27:57 +0800
• 8cca427146 search yinzuomei 2023-03-29 09:35:10 +0800
• a20a150a0e search yinzuomei 2023-03-29 09:32:12 +0800
• 78ebb11ea4 Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud-zhengwu-yantai wxz 2023-03-27 13:44:46 +0800
• b765a57b43 loginByThirdPlatform发送登录日志 yinzuomei 2023-03-27 11:15:06 +0800
• e5ba0732e8 thirdOpenFeignClient和丢了，找回 yinzuomei 2023-03-24 14:32:00 +0800
• 86c49074c4 Merge remote-tracking branch 'origin_elink/master' yinzuomei 2023-03-24 14:08:58 +0800
• 3542f686f5 /sys/log/operation/page去掉orgIdPath yinzuomei 2023-03-24 13:35:13 +0800
• 028537f34f /sys/log/operation/page去掉orgIdPath yinzuomei 2023-03-24 13:34:13 +0800
• c991992e82 工作端小程序退出增加操作日志；数字社区登录退出增加操作日志 yinzuomei 2023-03-24 13:19:11 +0800
• 3f1233e951 Merge remote-tracking branch 'origin_elink/master' yinzuomei 2023-03-22 15:26:33 +0800
• 9c714a4026 /epmetuser/dataSyncRecordDisability/detail/调整，删除居民增加逻辑 yinzuomei 2023-03-22 15:12:02 +0800
• 75b8c1572d /epmetuser/dataSyncRecordDisability/detail/调整，删除居民增加逻辑 yinzuomei 2023-03-22 15:09:45 +0800
• e4607ebd52 dataSyncRecordDisability/detail/ yinzuomei 2023-03-22 14:24:56 +0800
• ab64a71d07 1 yinzuomei 2023-03-22 11:19:40 +0800
• c8467ce542 Merge remote-tracking branch 'origin_elink/master' yinzuomei 2023-03-22 10:48:16 +0800
• dc1f33c5eb Merge remote-tracking branch 'origin_elink/master' yinzuomei 2023-03-22 10:04:07 +0800
• eb4f51bd64 /epmetuser/dataSyncRecordDisability/detail/1585903730961670146 yinzuomei 2023-03-22 10:01:28 +0800
• d54774f504 /epmetuser/dataSyncRecordDisability/detail/1585903730961670146 yinzuomei 2023-03-22 09:56:57 +0800
• de2cb50462 Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud-zhengwu-yantai wxz 2023-03-14 14:00:41 +0800
• d8903e3424 Merge remote-tracking branch 'origin/房屋tree_yzm' yinzuomei 2023-03-13 10:37:47 +0800
• 82eec85a7a upsertTagCount and del_flag='0' yinzuomei 2023-03-13 10:34:44 +0800
• af526ea708 upsertTagCount 添加del_flag='0' yinzuomei 2023-03-13 09:55:20 +0800
• 9ddd181564 Merge remote-tracking branch 'origin/房屋tree_yzm' yinzuomei 2023-03-13 09:31:28 +0800
• 2a1cc473a6 /auth/login/captcha/{uuid},文字版验证码 yinzuomei 2023-03-10 17:39:21 +0800
• d4afcaf9ab epmetuser/statsresiwarn/list支持传入多个小区， yinzuomei 2023-03-10 15:42:50 +0800
• 9a5db5ac8a epmetuser/statsresiwarn/list支持传入多个小区， yinzuomei 2023-03-10 14:13:26 +0800
• b569187add Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-03-10 10:45:27 +0800
• 641c10ab21 Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master yinzuomei 2023-03-10 10:41:24 +0800
• 13ca7651e8 Merge remote-tracking branch 'origin/房屋tree_yzm' yinzuomei 2023-03-10 10:38:12 +0800
• f4deeefe28 新增小区烟台客户id,不生成二维码 yinzuomei 2023-03-10 10:34:32 +0800
• 0700f063dd Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-03-10 08:56:59 +0800
• 98a2863949 /tag/page-list返回agencyName,pid yinzuomei 2023-03-09 16:04:19 +0800
• 1c0e8e3853 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-03-09 15:54:07 +0800
• b4ff5d9092 /gov/voice/tag/initTagScope yinzuomei 2023-03-09 15:49:43 +0800
• 5baf6cdae1 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-03-09 15:29:13 +0800
• 00623752b6 标签管理新增和修改增加agencyName,pid yinzuomei 2023-03-09 15:09:52 +0800
• 77c055ec7c 实时动态、党建宣传里的标签，只展示show_flag='1'的 yinzuomei 2023-03-09 14:24:51 +0800
• f00a56e948 Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master' yinzuomei 2023-03-09 12:17:32 +0800
• 2a6b38dac0 /epmetuser/more/badge/certification/detail yinzuomei 2023-03-09 11:08:27 +0800
• f4f5dd1ae1 党员徽章自动通过备注：居民信息是党员，徽章申请自动通过 yinzuomei 2023-03-09 11:07:23 +0800
• 550899ce26 徽章id+customer_id唯一呀，坑 yinzuomei 2023-03-09 10:51:34 +0800
• 576610dc08 党员徽章，判断居民信息-党员是，自动审核通过 yinzuomei 2023-03-09 10:24:53 +0800
• 9896bc669e gov/org/customeragency/agencylist返回orgIdPath yinzuomei 2023-03-09 09:39:13 +0800
• cdd94bd7e9 /gov/voice/tag/queryAgencyTag yinzuomei 2023-03-09 09:03:11 +0800
• a570c3fb34 徽章详情返回徽章名 yinzuomei 2023-03-08 11:24:59 +0800
• 80a12b2f0d Merge remote-tracking branch 'origin/房屋tree_yzm' yinzuomei 2023-03-07 14:05:23 +0800