yinzuomei
|
a1a70a2786
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
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 |
|
yinzuomei
|
1815be9515
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data
|
4 years ago |
wangxianzhang
|
6f806c407d
|
Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
yinzuomei
|
3a31907338
|
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/IcPartyUnitController.java
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
|
4 years ago |
|
wangxianzhang
|
d21721c227
|
Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_data
|
4 years ago |
|
wangxianzhang
|
6dcbe3c023
|
新增：
1.志愿者坐标分布统计定时任务
|
4 years ago |
|
yinzuomei
|
38c9211024
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyUnitDao.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcUserDemandRecDao.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyUnitDao.xml
# epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml
|
4 years ago |
|
yinzuomei
|
a1dc0941b6
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
397b2c367f
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data
|
4 years ago |
|
yinzuomei
|
4cbfd6f1a7
|
wangle fuzhi
|
4 years ago |
|
yinzuomei
|
7908623213
|
区域化党建单位群众满意度
|
4 years ago |
sunyuchao
|
6e4adcb198
|
组织下网格列表
|
4 years ago |
|
yinzuomei
|
35fc328c2f
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
zxc
|
03181c0445
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
zxc
|
d75280f49e
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
81ff0f4893
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
013283d7c9
|
需求研判分析返参调整
|
4 years ago |
|
yinzuomei
|
eb4e4df5e0
|
计算群众满意度
|
4 years ago |
|
wangxianzhang
|
bc326ca761
|
Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
3333b47141
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev_ic_data
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
990031cbf0
|
新增：
1.志愿者坐标分布
2.志愿者信息简介
|
4 years ago |
|
yinzuomei
|
8fcd4a2a72
|
SystemMessageType.CAL_PARTY_UNIT_SATISFACTION
|
4 years ago |
|
yinzuomei
|
cd43854e7b
|
SystemMessageType.CAL_PARTY_UNIT_SATISFACTION
|
4 years ago |
|
yinzuomei
|
87f1cbdd37
|
cal_party_unit_satisfaction
|
4 years ago |
|
yinzuomei
|
4e7fc38f94
|
CalPartyUnitSatisfactionFormDTO
|
4 years ago |
jianjun
|
869b943468
|
之前改集成平台的东西 改了表名 fact_topic_issue_grid_daily 到时候看一下吧 up
|
4 years ago |
|
jianjun
|
13f3654921
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
dbe0d7aef6
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
7ac69991af
|
之前改集成平台的东西 改了表名 fact_topic_issue_grid_daily 到时候看一下吧
|
4 years ago |
|
jianjun
|
ade006bc4e
|
议题统计bug-网格和组织统计 时间纬度应该都按照创建时间来 刚才改了个寂寞 up
|
4 years ago |
|
jianjun
|
3fadeb7b92
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
66dba4ce37
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
c6f0449593
|
议题统计bug-网格和组织统计 时间纬度应该都按照创建时间来 刚才改了个寂寞
|
4 years ago |
|
jianjun
|
e1474e3242
|
议题统计bug-网格和组织统计 时间纬度应该都按照创建时间来 up
|
4 years ago |
|
jianjun
|
2390117b6a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
1f37dd2d66
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
c6e7cc6477
|
议题统计bug-网格和组织统计 时间纬度应该都按照创建时间来
|
4 years ago |
|
yinzuomei
|
e7293181e8
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
5e740ecb3a
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
9a4e5e6b20
|
test2.1
|
4 years ago |
|
yinzuomei
|
f672525859
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
2e7bdb3d38
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
0ceaf6c5d0
|
test2
|
4 years ago |
|
yinzuomei
|
452452870d
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
8b8c912c51
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
yinzuomei
|
a021aefa03
|
test
|
4 years ago |
|
yinzuomei
|
9eb2d8ab50
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
fb4d66b32d
|
Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data
|
4 years ago |
|
yinzuomei
|
837b73d094
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
