wxz
|
2e1fa229ce
|
fix
|
2 years ago |
|
wxz
|
ac9f0dbe91
|
fix
|
2 years ago |
|
wxz
|
653b7f2c18
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
wxz
|
170bb78e6e
|
【灵山】项目，fix
|
2 years ago |
|
wxz
|
3019e9e84d
|
修改
|
2 years ago |
|
wxz
|
c619a02119
|
补充import
|
2 years ago |
|
wxz
|
3e185afacf
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanScreenServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
# epmet-user/epmet-user-server/src/main/resources/mapper/IcSpecialDao.xml
|
2 years ago |
|
wxz
|
42fe27d2c0
|
新增【灵山-重点帮扶人群】管理：导入
|
2 years ago |
luyan
|
4c293e5280
|
增加try catch
|
2 years ago |
|
luyan
|
61f31c3454
|
增加日志打印 orgPath
|
2 years ago |
|
luyan
|
d113f1e1ef
|
修改事件分析参数类型
|
2 years ago |
|
luyan
|
b30caa430f
|
修改事件分析参数类型
|
2 years ago |
|
luyan
|
24d9949836
|
修改事件分析参数类型
|
2 years ago |
|
luyan
|
5b575f834a
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
92a2746df6
|
修改事件分析统计方式；
|
2 years ago |
yinzuomei
|
8e131a01b1
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
yinzuomei
|
9d401dc694
|
灵山：/gov/org/building/building-distribution返回：partyCenterHouseFlag boolean true:代表此楼栋里有党员中心户； false:无
|
2 years ago |
|
wxz
|
48a359d159
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
8a854c3b59
|
fix: 大屏中央，各种人员类别数量菜单数量错误的问题
|
2 years ago |
|
luyan
|
c8d8506f81
|
修改各新村事件完成率统计；
|
2 years ago |
|
luyan
|
62aeaf4241
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
fe9d9f060e
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
9c7819f469
|
修改事件分析统计计算方式；
|
2 years ago |
|
wxz
|
1721925316
|
fix: 大屏特殊人群柱状图计算错误
|
2 years ago |
|
wxz
|
e7124fd279
|
fix: 大屏特殊人群柱状图计算错误
|
2 years ago |
|
wxz
|
f0f453e8ca
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
wxz
|
a4c8cc2184
|
fix: 大屏特殊人群柱状图计算错误
|
2 years ago |
|
luyan
|
1af47d7566
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
ce06ef6d4e
|
修改各村统计未显示新村名称的问题；
|
2 years ago |
|
wxz
|
61d3fe7cea
|
lingshanScreen/partyObjsByType 返回id字段
|
2 years ago |
|
wxz
|
b51abb8feb
|
lingshanScreen/partymemberList支持行政+党组织两种入参
|
2 years ago |
|
wxz
|
b0be7d95a0
|
fix
|
2 years ago |
|
wxz
|
0213c261dd
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
ac8a21f5ef
|
fix
|
2 years ago |
|
luyan
|
138017afe4
|
修改事件时丢失响应级别字段 eventType
|
2 years ago |
|
luyan
|
fad6ec73f2
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
luyan
|
7058eeae74
|
修改事件分析统计方法；
|
2 years ago |
|
wxz
|
c0716b14ac
|
fix
|
2 years ago |
|
wxz
|
cae9ea9396
|
fix:【灵山大屏-按组织查询党建活动统计】适配传入网格id的情况
|
2 years ago |
|
wxz
|
459ad8bea0
|
fix:【灵山大屏-按组织查询党建活动统计】适配传入网格id的情况
|
2 years ago |
|
wxz
|
33ee70df72
|
fix
|
2 years ago |
|
wxz
|
802c9e89a4
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
f6699621e7
|
修改：党建活动，列表返回附件
|
2 years ago |
|
wxz
|
4c3cbac7a6
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
luyan
|
cc80e06b77
|
大屏时间列表增加返回图片
|
2 years ago |
|
luyan
|
30f044bc9b
|
大屏时间列表增加返回图片
|
2 years ago |
|
luyan
|
b351d813d4
|
Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master
|
2 years ago |
|
wxz
|
e7f7eb9990
|
fix：党建活动和数量double了
|
2 years ago |
|
wxz
|
0042d4d754
|
Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into lingshan_master
|
2 years ago |
|
luyan
|
ddcb05d4be
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
