yinzuomei
|
1489e82ad3
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
yinzuomei
|
b363f3185f
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
zhaoqifeng
|
1250b33cbd
|
Merge branch 'dev_ic_data' into develop
|
4 years ago |
|
zhaoqifeng
|
2d934e9892
|
社区党建数据分析
|
4 years ago |
zxc
|
631f0ce1d5
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
zxc
|
ba13a313ad
|
版本
|
4 years ago |
|
yinzuomei
|
950bb3fb14
|
/resi/hall/issue/detail增加shiftIssueTime
|
4 years ago |
|
yinzuomei
|
e4af2c23d2
|
resi/group/topic/gettopicdetail返回gridName
|
4 years ago |
|
zxc
|
0fdf358528
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
zxc
|
974da27bc0
|
分页修改
|
4 years ago |
|
zhaoqifeng
|
d3dcfb8ecc
|
Merge branch 'dev_ic_data' into develop
|
4 years ago |
|
zhaoqifeng
|
7112bd44c6
|
社区党建数据分析-党员相关
|
4 years ago |
wangxianzhang
|
e7712bd92f
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
zxc
|
9f4c059c23
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
wangxianzhang
|
068fbe7f62
|
Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
zxc
|
5a420886a1
|
颜色
|
4 years ago |
|
wangxianzhang
|
302c72d7bb
|
修改：
1.志愿者分布参数命名调整
|
4 years ago |
|
wangxianzhang
|
b5d1790bff
|
修改：
1.志愿者分布参数命名调整
|
4 years ago |
|
wangxianzhang
|
7de4721f67
|
Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_data
|
4 years ago |
|
wangxianzhang
|
9616152d18
|
修改：
1.优化志愿者分布统计任务
|
4 years ago |
|
yinzuomei
|
3406566962
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
08ed2cefce
|
warn
|
4 years ago |
|
zxc
|
1d6ed0ad02
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
zxc
|
5c38d791f3
|
total
|
4 years ago |
|
zxc
|
b8d3612004
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
zxc
|
e901deaff6
|
加了个orgLevel
|
4 years ago |
|
yinzuomei
|
ecf60ef841
|
需求分类改个排序
|
4 years ago |
|
zxc
|
8c29feac5c
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
zxc
|
9268b781f8
|
加了个orgLevel
|
4 years ago |
sunyuchao
|
f683737574
|
Merge branch 'dev_ic_data' into develop
|
4 years ago |
|
sunyuchao
|
76375c3c78
|
草他妈的都要服了
|
4 years ago |
|
yinzuomei
|
623de6e04f
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
2f6a52def7
|
区域化党建单位满意度，四舍五入保留两位小数
|
4 years ago |
|
sunyuchao
|
e31b9c217f
|
Merge branch 'dev_ic_data' into develop
|
4 years ago |
|
sunyuchao
|
3cd249389b
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data
|
4 years ago |
|
sunyuchao
|
ffb4ce8b7a
|
旧接口加返参 组织网格返经纬度 没值就取根组织的值
|
4 years ago |
|
zxc
|
2748d1a126
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
zxc
|
e8768deb31
|
改了个颜色儿😡
|
4 years ago |
|
yinzuomei
|
da9a3e8e83
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
e7131804f3
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
|
4 years ago |
|
yinzuomei
|
df4262390c
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data
|
4 years ago |
|
yinzuomei
|
11c3d11fb5
|
Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data
Conflicts:
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcUserDemandRecController.java
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
|
4 years ago |
|
sunyuchao
|
355c80552e
|
colour改color 人才济济 掉头发
|
4 years ago |
|
yinzuomei
|
8580a2c467
|
区域化党建单位满意度
|
4 years ago |
|
zhaoqifeng
|
c9bde02ec0
|
Merge branch 'dev_ic_data' into develop
|
4 years ago |
|
zxc
|
38b16342c2
|
remark
|
4 years ago |
|
sunyuchao
|
a8dbd8a085
|
Merge branch 'dev_ic_data' into develop
|
4 years ago |
|
sunyuchao
|
30e37af992
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data
|
4 years ago |
|
sunyuchao
|
d97ffae9bc
|
直属下级组织加经纬度
|
4 years ago |
|
yinzuomei
|
24e5b92d7d
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
|
4 years ago |
