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 |
|
yinzuomei
|
960c302644
|
安全生产隐患
|
3 years ago |
|
sunyuchao
|
3661de73e3
|
联建单位、社会自组织取消同步操作
|
3 years ago |
|
yinzuomei
|
6c06a8c829
|
事件内容20字
|
3 years ago |
|
yinzuomei
|
1f9e1c21c8
|
城市管理事件
|
3 years ago |
|
yinzuomei
|
b1f3b0c82f
|
占个位置
|
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 |
|
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 |
|
yinzuomei
|
82a08f54d9
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
yinzuomei
|
0be377f923
|
未完待续
|
3 years ago |
|
wangxianzhang
|
d973d651df
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
3 years ago |
|
wangxianzhang
|
6b5c09b3cb
|
【图层】完成查询右侧菜单接口
|
3 years ago |
|
zxc
|
0e38202423
|
给客户勾选菜单时，删除缓存
|
3 years ago |
|
zxc
|
e89f54b623
|
获取客户下菜单加了个feign方法
|
3 years ago |
|
yinzuomei
|
e308c57abb
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
yinzuomei
|
d680d49eeb
|
综合治理图层
|
3 years ago |
|
wangxianzhang
|
52c9ceb3d0
|
【图层】增加新列
|
3 years ago |
|
yinzuomei
|
210189e227
|
综合治理图层查询2
|
3 years ago |
|
yinzuomei
|
820f9a9db0
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
yinzuomei
|
c8156fe4c0
|
综合治理图层查询1
|
3 years ago |
|
zxc
|
d71dcddbd2
|
暂提
|
3 years ago |
|
yinzuomei
|
94f1d51d5e
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_five_coverage
|
3 years ago |
jianjun
|
196eb9f197
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service'
|
3 years ago |
|
wangxianzhang
|
41c95f9823
|
【政策】修复
|
3 years ago |
|
yinzuomei
|
eea11e5da9
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
422a130faa
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
yinzuomei
|
c856d4647b
|
个人档案上报事件接口调整
|
3 years ago |
|
sunyuchao
|
a0e4c963c2
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
3 years ago |
|
sunyuchao
|
7433f807bf
|
联建单位、社会自组织校验工作人员信息使用
|
3 years ago |
|
jianjun
|
c26e248a97
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service'
|
3 years ago |
|
yinzuomei
|
c9aa7ab54c
|
temp
|
3 years ago |
|
yinzuomei
|
c9bd4bf5c2
|
temp
|
3 years ago |
|
jianjun
|
8de692dfae
|
Merge remote-tracking branch 'remotes/origin/dev_fangzhu'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
|
3 years ago |
|
wangxianzhang
|
7b159e8d6b
|
【政策】修复
|
3 years ago |
