wangxianzhang
|
2bbdc81cf8
|
-
|
4 years ago |
|
wangxianzhang
|
5f0868e7d8
|
fastjson版本升级到1.2.79
|
4 years ago |
|
wangxianzhang
|
32320418d3
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_thirdtest
|
4 years ago |
|
wangxianzhang
|
eab547db29
|
Merge branch 'wxz_templatedownload' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 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
|
4 years ago |
jianjun
|
eb58ead3f1
|
固定宽度
|
4 years ago |
|
wangxianzhang
|
bd9857c150
|
新增
1.第三方平台接入示例
|
4 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
|
4 years ago |
|
wangxianzhang
|
49833400f5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
aede50c3c4
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
d3fe13dc9c
|
巡查先测测程序 稳定后 直接停用
|
4 years ago |
|
jianjun
|
6e7f85c2c6
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
46735be430
|
添加表单查询配置 列宽
|
4 years ago |
sunyuchao
|
485f360692
|
书记日志脚本
|
4 years ago |
|
jianjun
|
a281f5e946
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_warn_notice
|
4 years ago |
|
jianjun
|
1e379e4d0b
|
Revert "添加表单查询配置 列宽"
This reverts commit ebbd8482
|
4 years ago |
|
jianjun
|
ebbd84821b
|
添加表单查询配置 列宽
|
4 years ago |
|
sunyuchao
|
eb9a8ea999
|
Merge branches 'dev' and 'dev_memo' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_memo
|
4 years ago |
|
jianjun
|
6da2a6682f
|
Revert "根据id逻辑删除方法 并填充字段"
This reverts commit 3a27ac45
|
4 years ago |
|
jianjun
|
606d7a303f
|
具名类别预警通知
|
4 years ago |
|
jianjun
|
3a27ac452f
|
根据id逻辑删除方法 并填充字段
|
4 years ago |
|
jianjun
|
4365364ed1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
303703a316
|
菜单缓存必须全干掉 *
|
4 years ago |
|
sunyuchao
|
630ff1508f
|
.
|
4 years ago |
|
jianjun
|
d46e8e1154
|
菜单缓存必须全干掉
|
4 years ago |
|
sunyuchao
|
5087e746e9
|
详情加返参
|
4 years ago |
|
sunyuchao
|
b032602160
|
.
|
4 years ago |
|
sunyuchao
|
09626bbf06
|
时间不要秒
|
4 years ago |
zhaoqifeng
|
d853127b56
|
数据校验
|
4 years ago |
|
sunyuchao
|
6ffb1e693f
|
Merge remote-tracking branch 'origin/dev_memo' into dev_memo
|
4 years ago |
|
sunyuchao
|
b7654d49b9
|
相同时间只取一条
|
4 years ago |
|
wangxianzhang
|
d8d292f58c
|
修改
1.党员风采 模板下载
2.社区自组织 模板下载
|
4 years ago |
|
zhaoqifeng
|
4184ad6ccf
|
Merge branch 'dev_work_event' into dev
|
4 years ago |
|
zhaoqifeng
|
b7abc3eb1c
|
项目历史数据
|
4 years ago |
|
sunyuchao
|
3c0e86430b
|
组织、用户数据同步中介库表字段变动调整
|
4 years ago |
|
wangxianzhang
|
5f4b0a59ea
|
Merge branch 'wxz_templatedownload' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_memo
|
4 years ago |
|
wangxianzhang
|
396c7cd1f4
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
zhaoqifeng
|
010069dbed
|
人员关怀
|
4 years ago |
|
wangxianzhang
|
f5447dc608
|
新增
1.党员风采 模板下载
2.社区自组织 模板下载
|
4 years ago |
|
sunyuchao
|
332f154130
|
mq参数bug调整
|
4 years ago |
|
sunyuchao
|
95ed4d218e
|
代码调整
|
4 years ago |
|
wangxianzhang
|
9df11f7bd6
|
修改:解决jar包内文件无法读取
|
4 years ago |
|
wangxianzhang
|
041ad7979f
|
修改:解决jar包内文件无法读取
|
4 years ago |
|
zhaoqifeng
|
c91570f3cb
|
人员关怀
|
4 years ago |
zxc
|
0328a84ad8
|
提示语
|
4 years ago |
|
zhaoqifeng
|
4dffdf1ded
|
人员关怀
|
4 years ago |
|
sunyuchao
|
f97f4e15e0
|
难点堵点详情已读修改
|
4 years ago |
|
sunyuchao
|
d51f66be47
|
难点堵点列表
|
4 years ago |
|
zhaoqifeng
|
dbe98fab02
|
工作日志
|
4 years ago |
|
wangxianzhang
|
3baa8b9e5c
|
修改
|
4 years ago |
