zxc
|
caa7b4b4b2
|
import 错误信息重复
|
3 years ago |
zxc
|
2b9de61853
|
import
|
3 years ago |
jianjun
|
77176c0bf4
|
feign trix配置线程池参数
|
3 years ago |
yinzuomei
|
e16c68732b
|
报事人大代表和报给组织,pids调整
|
3 years ago |
jianjun
|
2bffec01ec
|
导入房间报错
|
3 years ago |
yinzuomei
|
3a0cf66e63
|
/gov/org/agency/editagency修改组织信息bugfix2
|
3 years ago |
yinzuomei
|
16cab43752
|
/gov/org/agency/editagency修改组织信息bugfix
|
3 years ago |
zhaoqifeng
|
ecaecdf67d
|
治理指数办结效率和响应度
|
3 years ago |
jianjun
|
f08678d3f1
|
组织树添加临时缓存 要不然前端容易挂 bug
|
3 years ago |
jianjun
|
f9ac648849
|
组织树添加临时缓存 要不然前端容易挂 bug
|
3 years ago |
jianjun
|
cef8129dd5
|
组织树添加临时缓存 要不然前端容易挂
|
3 years ago |
jianjun
|
87354c931f
|
通知描述
|
3 years ago |
jianjun
|
b8732f0a33
|
通知修改为中文
|
3 years ago |
wangxianzhang
|
6ba5fd4009
|
修复编译失败问题
|
3 years ago |
wangxianzhang
|
0b1040d6ba
|
去掉无用日志
|
3 years ago |
wangxianzhang
|
2bbdc81cf8
|
-
|
3 years ago |
wangxianzhang
|
5f0868e7d8
|
fastjson版本升级到1.2.79
|
3 years ago |
wangxianzhang
|
32320418d3
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_thirdtest
|
3 years ago |
wangxianzhang
|
eab547db29
|
Merge branch 'wxz_templatedownload' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
wangxianzhang
|
5fd50363e7
|
Merge branch 'dev_warn_notice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
Conflicts:
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
|
3 years ago |
jianjun
|
eb58ead3f1
|
固定宽度
|
3 years ago |
wangxianzhang
|
bd9857c150
|
新增
1.第三方平台接入示例
|
3 years ago |
wangxianzhang
|
446c2a552b
|
Merge branch 'wxz_ttl' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
3 years ago |
wangxianzhang
|
49833400f5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
jianjun
|
aede50c3c4
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
jianjun
|
d3fe13dc9c
|
巡查先测测程序 稳定后 直接停用
|
3 years ago |
jianjun
|
6e7f85c2c6
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
jianjun
|
46735be430
|
添加表单查询配置 列宽
|
3 years ago |
jianjun
|
a281f5e946
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_warn_notice
|
3 years ago |
jianjun
|
1e379e4d0b
|
Revert "添加表单查询配置 列宽"
This reverts commit ebbd8482
|
3 years ago |
jianjun
|
ebbd84821b
|
添加表单查询配置 列宽
|
3 years ago |
jianjun
|
6da2a6682f
|
Revert "根据id逻辑删除方法 并填充字段"
This reverts commit 3a27ac45
|
3 years ago |
jianjun
|
606d7a303f
|
具名类别预警通知
|
3 years ago |
jianjun
|
3a27ac452f
|
根据id逻辑删除方法 并填充字段
|
3 years ago |
jianjun
|
4365364ed1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
jianjun
|
303703a316
|
菜单缓存必须全干掉 *
|
3 years ago |
jianjun
|
d46e8e1154
|
菜单缓存必须全干掉
|
3 years ago |
wangxianzhang
|
d8d292f58c
|
修改
1.党员风采 模板下载
2.社区自组织 模板下载
|
3 years ago |
zhaoqifeng
|
4184ad6ccf
|
Merge branch 'dev_work_event' into dev
|
3 years ago |
zhaoqifeng
|
b7abc3eb1c
|
项目历史数据
|
3 years ago |
sunyuchao
|
3c0e86430b
|
组织、用户数据同步中介库表字段变动调整
|
3 years ago |
wangxianzhang
|
396c7cd1f4
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
wangxianzhang
|
f5447dc608
|
新增
1.党员风采 模板下载
2.社区自组织 模板下载
|
3 years ago |
sunyuchao
|
332f154130
|
mq参数bug调整
|
3 years ago |
zhaoqifeng
|
30f35c723c
|
小区重名
|
3 years ago |
jianjun
|
523951d470
|
修改hystrix线程池配置参数
|
3 years ago |
zhaoqifeng
|
a21c3790c7
|
小区重名
|
3 years ago |
yinzuomei
|
44484685d5
|
warn
|
3 years ago |
jianjun
|
804d752ced
|
测试下 up
|
3 years ago |
jianjun
|
da58fb850b
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |