epmet-cloud-lingshan

25b51897bd 不指定泛型 yinzuomei 2023-04-20 17:02:11 +0800
36cfd2d617 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-20 16:02:48 +0800
eb15e0c768 //获取工作人员所属组织同级的党组织改为调用同一方法 yinzuomei 2023-04-20 15:59:14 +0800
b9605d967d 烟台党员画像列表，导出 yinzuomei 2023-04-20 15:52:31 +0800
8be6303cd6 Merge branch 'lingshan_master' into dev wxz 2023-04-20 14:32:36 +0800
c90b82d796 Merge branch 'wxz_importtask_addnumber' into dev wxz 2023-04-20 14:26:24 +0800
6d32e0620a Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev wxz 2023-04-20 14:26:18 +0800
79a5c62b62 增加导入记录按照id查询 wxz 2023-04-20 14:23:50 +0800
7a96333922 增加导入记录按照id查询 wxz 2023-04-20 14:19:47 +0800
a80f024c3f 烟台党员画像列表返参dto回归正常位置 yinzuomei 2023-04-20 14:06:03 +0800
cda40ad9d5 调整王童的方法 yinzuomei 2023-04-20 14:03:08 +0800
54695bfee9 完成灵山社会维稳导入 wxz 2023-04-20 13:57:53 +0800
c3b5e8e6d3 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-20 12:35:19 +0800
1f675bf4c4 居民画像列表学历sql判断写死 yinzuomei 2023-04-20 12:30:06 +0800
5b54f0b09b Merge branch 'lingshan_master' into dev wxz 2023-04-20 10:22:48 +0800
1fb9e524cd Merge branch 'wxz_importtask_addnumber' into lingshan_master wxz 2023-04-20 09:39:00 +0800
bee92b0ce8 1 wxz 2023-04-20 09:38:51 +0800
35e59a0641 Merge remote-tracking branch 'origin/dev' into dev wxz 2023-04-19 19:33:51 +0800
88abe4f9d5 Merge branch 'wxz_importtask_addnumber' into dev wxz 2023-04-19 19:33:21 +0800
a99c14d85a 1.修改：import task 增加成功条数和失败条数 wxz 2023-04-19 19:31:50 +0800
3f10acdbf9 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-19 18:58:18 +0800
46afd543f1 柱状图，点击曲线，查看街道 yinzuomei 2023-04-19 18:57:02 +0800
23295fd158 【灵山街道】1.导入接口,增加表头预校验 wxz 2023-04-19 18:42:06 +0800
8def3d6973 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-19 17:51:09 +0800
ec0ab04170 居民画像导出 yinzuomei 2023-04-19 17:48:17 +0800
44e024a77a 居民画像导出 yinzuomei 2023-04-19 17:46:32 +0800
c4f6cbfe44 居民画像返回总数 yinzuomei 2023-04-19 17:39:28 +0800
8e6bc27e98 Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-04-19 16:57:53 +0800
01717d97d8 【灵山街道】1.新增导入接口，完成一半 wxz 2023-04-19 16:57:38 +0800
1a51f91a75 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-19 14:49:38 +0800
7caf2b33f3 /gov/org/icneighborhood/neighborhoodlist分页，且只根据小区名称检索 yinzuomei 2023-04-19 14:46:57 +0800
80c15eb049 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-19 14:44:15 +0800
99e245dee8 /gov/org/icneighborhood/neighborhoodlist分页，且只根据小区名称检索 yinzuomei 2023-04-19 14:33:43 +0800
e476725b24 /gov/org/icneighborhood/neighborhoodlist分页，且只根据小区名称检索 yinzuomei 2023-04-19 14:31:17 +0800
44208966ac 控制台打印转换为log.info(),修改参数常量 luyan 2023-04-19 14:25:47 +0800
674fba43c7 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-04-19 10:40:28 +0800
c31da6b351 房屋数统一 lichao 2023-04-19 10:37:28 +0800
dc42bdfa4e Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-18 16:34:50 +0800
808f65a08e Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-04-18 16:29:34 +0800
a7e0d2e898 账号登录情况，左下角下级社区账号登录次数展示前10，且不展示次数0的 yinzuomei 2023-04-18 16:28:58 +0800
1028190985 Merge branch 'dev' of http://121.42.41.42:7070/r/epmet-cloud into dev 曲树通 2023-04-18 16:16:25 +0800
df21efe8a6 Merge branch 'yantai_zhengwu_master' into dev 曲树通 2023-04-18 16:15:39 +0800
d3e4887835 导出修改文件名曲树通 2023-04-18 16:13:01 +0800
4d287c3d67 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-04-18 16:10:52 +0800
bf7ea56aef 房屋状态 lichao 2023-04-18 16:08:08 +0800
8eb3267532 统计更新 lichao 2023-04-18 16:00:47 +0800
88ea3e308d Merge branch 'yantai_zhengwu_master' into dev lichao 2023-04-18 15:51:20 +0800
818722d2f8 房屋、组织 0值 lichao 2023-04-18 15:48:24 +0800
b35a699620 社区及账号登录，导出 yinzuomei 2023-04-18 15:31:24 +0800
4649ca6c33 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-04-18 15:21:38 +0800
24fc1b1af5 居民画像orgIdPathlike yinzuomei 2023-04-18 15:20:04 +0800
b0d3343851 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-04-18 15:15:29 +0800
dfb74fedc8 镇街数修改 lichao 2023-04-18 15:14:01 +0800
5a4e5de9c7 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into yantai_zhengwu_master yinzuomei 2023-04-18 15:07:33 +0800
75c7fca923 账号登录登录情况，柱状图调整 yinzuomei 2023-04-18 15:07:07 +0800
5921f17761 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-04-18 15:03:03 +0800
86e770d787 组织开通修改 lichao 2023-04-18 15:01:09 +0800
960e252cec 【灵山大屏】1.修改：orgmap接口调整，使用EpmetRequestHolder代替@LoginUser注解。 wxz 2023-04-18 14:30:13 +0800
d5f8327d47 Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master wxz 2023-04-18 14:01:23 +0800
a177f6be63 【灵山大屏】1.修改：去掉对/orgmap接口的鉴权，因为大屏要用 wxz 2023-04-18 14:00:20 +0800
d715eeedc2 九小场所画像导出文件名调整 yinzuomei 2023-04-18 11:03:50 +0800
98801451ad Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-18 10:17:41 +0800
62b0b7e44b /resi/mine/personalcenter/initinfo返回gridId,gridName yinzuomei 2023-04-18 10:14:15 +0800
a80d6f01ec 即墨灵山事件管理 luyan 2023-04-18 09:57:06 +0800
de46e965df Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master wxz 2023-04-18 09:07:16 +0800
0c8b73fe0e Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud wxz 2023-04-17 17:29:57 +0800
3fb2c8dddc Merge branch 'lingshan_master' into dev luyan 2023-04-17 16:57:42 +0800
51c566fdd2 腾讯呼叫中心获取sdk luyan 2023-04-17 16:53:50 +0800
8509b817bb Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master luyan 2023-04-17 16:34:30 +0800
e1919a7693 腾讯呼叫中心获取sdkUrl luyan 2023-04-17 16:33:51 +0800
560ae03b31 【灵山大屏】1.新增：根据组织id查询党员数接口 wxz 2023-04-17 14:47:38 +0800
ef58093453 Merge branch 'master' into yantai_zhengwu_master wxz 2023-04-17 10:54:55 +0800
507d31c4a1 Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master wxz 2023-04-17 10:54:19 +0800
5e1ea951da 【灵山大屏】fix 1.党员列表-年龄错误的问题 wxz 2023-04-17 10:04:10 +0800
e3f89b422b 【灵山大屏】1.党员列表。2.柱状统计图 wxz 2023-04-14 23:58:54 +0800
bf48683ca1 【灵山大屏】1.党组织，党建活动数量查询. 2.党组织树查询 wxz 2023-04-14 15:18:24 +0800
78b6a4799b Merge branch 'yantai_zhengwu_master' into dev 曲树通 2023-04-14 13:40:06 +0800
2e6b2d5953 补充曲树通 2023-04-14 13:38:19 +0800
4c848654df Merge branch 'yantai_zhengwu_master' into dev 曲树通 2023-04-14 13:28:26 +0800
b63c850810 补充曲树通 2023-04-14 13:27:06 +0800
b29bce524e Merge branch 'yantai_zhengwu_master' into dev 曲树通 2023-04-14 11:11:27 +0800
7c5fe9adaa 修改曲树通 2023-04-14 11:09:37 +0800
01df7479c6 Merge branch 'yantai_zhengwu_master' into dev lichao 2023-04-14 10:42:24 +0800
56f43c9600 Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master lichao 2023-04-14 10:40:42 +0800
1350ff9953 更新房屋统计 lichao 2023-04-14 10:40:36 +0800
dd5dd3b853 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-13 17:43:18 +0800
d21542e49f agerange:ic_resi_user.BIRTHDAY yinzuomei 2023-04-13 17:41:54 +0800
18daa2e62f Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-13 17:34:35 +0800
89b777e13b 排除不为空的 yinzuomei 2023-04-13 17:32:53 +0800
53d0e9a08d Merge branch 'yantai_zhengwu_master' into dev lichao 2023-04-13 16:15:33 +0800
a72325db6f 柱状图 lichao 2023-04-13 16:14:12 +0800
2b69e2dabb Merge branch 'yantai_zhengwu_master' into dev lichao 2023-04-13 15:49:20 +0800
601d806ce4 房屋画像列表 lichao 2023-04-13 15:48:59 +0800
62ed49f324 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-13 12:49:11 +0800
2709356787 /gov/org/enterprise/list yinzuomei 2023-04-13 12:47:29 +0800
40820a8b88 /gov/org/enterprise/list yinzuomei 2023-04-13 12:41:25 +0800
0140f1fe60 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-13 12:31:01 +0800
65cc3a319a /gov/org/enterprise/list yinzuomei 2023-04-13 12:27:59 +0800
58300a0466 居民信息列表调整agerange yinzuomei 2023-04-13 12:21:03 +0800
e0b0d1ccf1 Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev yinzuomei 2023-04-13 11:20:59 +0800

Commit Graph Select branches Hide Pull Requests master Mono Color

Commit Graph

Select branches

Hide Pull Requests

master