zhaoqifeng
|
c632e652b5
|
组织项目统计,网格员项目统计
|
3 years ago |
wangxianzhang
|
122be4cace
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
3 years ago |
|
wangxianzhang
|
452b6d75f5
|
【图层】可视化-左侧菜单增加menu控制
|
3 years ago |
sunyuchao
|
73e0136299
|
通讯录部门列表增加返参，部门加人、删除操作增加判断
|
3 years ago |
yinzuomei
|
09b22bbc59
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
yinzuomei
|
bb57374c87
|
z综合治理人群，公共服务，这些居民，显示姓名(身份证号)
|
3 years ago |
zxc
|
36a89abc4a
|
漏提
|
3 years ago |
|
wangxianzhang
|
ed31dba2c8
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
3 years ago |
|
sunyuchao
|
9c71c97798
|
社会自组织、联建单位列表增加返参
|
3 years ago |
jianjun
|
1f9c7e4ebc
|
Merge remote-tracking branch 'remotes/origin/dev_project_statis'
|
3 years ago |
|
yinzuomei
|
30c3dd1910
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
yinzuomei
|
4a70c11598
|
公共服务人群
|
3 years ago |
|
zxc
|
90d2d7b14a
|
暂提搜索
|
3 years ago |
|
wangxianzhang
|
c87bf8e540
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
Conflicts:
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
|
3 years ago |
|
wangxianzhang
|
54e47611a2
|
【图层】可视化，做了一些优化
|
3 years ago |
|
sunyuchao
|
dd6aa8efbc
|
新增联建单位负责人、社区自组织负责人两个默认角色不允许删除
|
3 years ago |
|
sunyuchao
|
0ce06e1806
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
sunyuchao
|
9f2c565e68
|
联建单位、社会自组织删除时增加判断是否同步到通讯录 是否有未办结项目
|
3 years ago |
|
yinzuomei
|
e5a9a3be4f
|
安全生产隐患2
|
3 years ago |
|
yinzuomei
|
77a478bfac
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
zhaoqifeng
|
e6eabdde06
|
组织项目统计,网格员项目统计
|
3 years ago |
|
yinzuomei
|
960c302644
|
安全生产隐患
|
3 years ago |
|
sunyuchao
|
3661de73e3
|
联建单位、社会自组织取消同步操作
|
3 years ago |
|
yinzuomei
|
6c06a8c829
|
事件内容20字
|
3 years ago |
|
yinzuomei
|
1f9e1c21c8
|
城市管理事件
|
3 years ago |
|
zhaoqifeng
|
ab6072c1ce
|
组织项目统计,网格员项目统计
|
3 years ago |
|
yinzuomei
|
b1f3b0c82f
|
占个位置
|
3 years ago |
|
zhaoqifeng
|
9243f4e334
|
组织项目统计,网格员项目统计
|
3 years ago |
|
yinzuomei
|
9a5a9273dd
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
yinzuomei
|
e72fbfc1bd
|
缺个短信模板编码
|
3 years ago |
|
sunyuchao
|
583286a943
|
联建单位、社会自组织同步到通讯录
|
3 years ago |
|
yinzuomei
|
dc78b88843
|
11
|
3 years ago |
|
wangxianzhang
|
aafdf59d8b
|
【图层】可视化，左侧菜单加上了公共服务人群,还有全局的数量要算
|
3 years ago |
|
wangxianzhang
|
6c8c176551
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
3 years ago |
|
wangxianzhang
|
7be9b70e22
|
【图层】左侧还差公共服务人群
|
3 years ago |
|
wangxianzhang
|
0306070a5f
|
Merge branches 'dev_policy_service' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
8d27413c88
|
【政策找人】修复年龄->出生日期重复转换问题
|
3 years ago |
|
wangxianzhang
|
aa55712fcf
|
Merge branch 'dev_policy_service' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
62170e8313
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
e59f5b5d93
|
Merge remote-tracking branch 'origin/dev_policy_service' into dev_policy_service
|
3 years ago |
|
wangxianzhang
|
0dc78a13dc
|
【政策找人】修复年龄->出生日期转换问题
|
3 years ago |
|
yinzuomei
|
a4cad2a98d
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
yinzuomei
|
a209553d82
|
指派需求发短信
|
3 years ago |
|
sunyuchao
|
a0f5361ac8
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
# Conflicts:
# epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java
# epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java
|
3 years ago |
|
sunyuchao
|
fba0a7772b
|
查角色
|
3 years ago |
|
jianjun
|
0596ebb777
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_partymemberimport'
|
3 years ago |
|
zhaoqifeng
|
d0e24d6670
|
党员导入可覆盖原有信息
|
3 years ago |
|
yinzuomei
|
5b1ddcd8fb
|
Merge remote-tracking branch 'origin/dev_policy_service'
|
3 years ago |
|
yinzuomei
|
dcf0103853
|
恢复年龄组件
|
3 years ago |
|
yinzuomei
|
82a08f54d9
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
