yinzuomei
|
b1f3b0c82f
|
占个位置
|
4 years ago |
zhaoqifeng
|
9243f4e334
|
组织项目统计,网格员项目统计
|
4 years ago |
|
yinzuomei
|
9a5a9273dd
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
4 years ago |
|
yinzuomei
|
e72fbfc1bd
|
缺个短信模板编码
|
4 years ago |
sunyuchao
|
583286a943
|
联建单位、社会自组织同步到通讯录
|
4 years ago |
|
yinzuomei
|
dc78b88843
|
11
|
4 years ago |
wangxianzhang
|
aafdf59d8b
|
【图层】可视化，左侧菜单加上了公共服务人群,还有全局的数量要算
|
4 years ago |
|
wangxianzhang
|
6c8c176551
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
4 years ago |
|
wangxianzhang
|
7be9b70e22
|
【图层】左侧还差公共服务人群
|
4 years ago |
|
wangxianzhang
|
17b5f7d1ca
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
0306070a5f
|
Merge branches 'dev_policy_service' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
8d27413c88
|
【政策找人】修复年龄->出生日期重复转换问题
|
4 years ago |
|
wangxianzhang
|
3ec84b2ddc
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/empet_cloud_yantai
|
4 years ago |
jianjun
|
fd9ebb3329
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_partymemberimport' into 烟台master
|
4 years ago |
|
jianjun
|
8442ac7868
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service' into 烟台master
|
4 years ago |
|
wangxianzhang
|
aa55712fcf
|
Merge branch 'dev_policy_service' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
62170e8313
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
e59f5b5d93
|
Merge remote-tracking branch 'origin/dev_policy_service' into dev_policy_service
|
4 years ago |
|
wangxianzhang
|
0dc78a13dc
|
【政策找人】修复年龄->出生日期转换问题
|
4 years ago |
|
yinzuomei
|
a4cad2a98d
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
4 years ago |
|
yinzuomei
|
a209553d82
|
指派需求发短信
|
4 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
|
4 years ago |
|
sunyuchao
|
fba0a7772b
|
查角色
|
4 years ago |
|
jianjun
|
0596ebb777
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_partymemberimport'
|
4 years ago |
|
zhaoqifeng
|
d0e24d6670
|
党员导入可覆盖原有信息
|
4 years ago |
|
yinzuomei
|
5b1ddcd8fb
|
Merge remote-tracking branch 'origin/dev_policy_service'
|
4 years ago |
|
yinzuomei
|
dcf0103853
|
恢复年龄组件
|
4 years ago |
|
yinzuomei
|
82a08f54d9
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
4 years ago |
|
yinzuomei
|
0be377f923
|
未完待续
|
4 years ago |
|
zhaoqifeng
|
88420ebd93
|
组织项目统计
|
4 years ago |
|
wangxianzhang
|
d973d651df
|
Merge branch 'dev_five_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_five_coverage
|
4 years ago |
|
wangxianzhang
|
6b5c09b3cb
|
【图层】完成查询右侧菜单接口
|
4 years ago |
zxc
|
0e38202423
|
给客户勾选菜单时，删除缓存
|
4 years ago |
|
zxc
|
e89f54b623
|
获取客户下菜单加了个feign方法
|
4 years ago |
|
yinzuomei
|
e308c57abb
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
4 years ago |
|
yinzuomei
|
d680d49eeb
|
综合治理图层
|
4 years ago |
|
wangxianzhang
|
52c9ceb3d0
|
【图层】增加新列
|
4 years ago |
|
yinzuomei
|
210189e227
|
综合治理图层查询2
|
4 years ago |
|
yinzuomei
|
820f9a9db0
|
Merge remote-tracking branch 'origin/dev_five_coverage' into dev_five_coverage
|
4 years ago |
|
yinzuomei
|
c8156fe4c0
|
综合治理图层查询1
|
4 years ago |
|
zxc
|
d71dcddbd2
|
暂提
|
4 years ago |
|
yinzuomei
|
94f1d51d5e
|
Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into dev_five_coverage
|
4 years ago |
|
jianjun
|
2c7e7f7999
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台master
|
4 years ago |
|
jianjun
|
27bd5e1000
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service' into 烟台master
|
4 years ago |
|
jianjun
|
196eb9f197
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service'
|
4 years ago |
|
wangxianzhang
|
41c95f9823
|
【政策】修复
|
4 years ago |
|
jianjun
|
4c84bef687
|
Merge remote-tracking branch 'remotes/origin/dev_policy_service' into 烟台master
|
4 years ago |
|
jianjun
|
a5ff2ad7c2
|
Merge remote-tracking branch 'remotes/origin/dev_fangzhu' into 烟台master
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
|
4 years ago |
|
yinzuomei
|
eea11e5da9
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
4 years ago |
|
yinzuomei
|
422a130faa
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
