zhangyuan
|
43bcadeffc
|
dim表筛选数据
|
3 years ago |
jianjun
|
73c382d6b7
|
Merge remote-tracking branch 'remotes/origin/dev_party_mange'
|
3 years ago |
wangxianzhang
|
0b4a05af31
|
Merge branch 'dev_icservice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_icservice
|
3 years ago |
|
wangxianzhang
|
3ef6a425db
|
新增：服务项目，服务范围树查询
|
3 years ago |
yinzuomei
|
53e24a571b
|
serviceCategoryKey
|
3 years ago |
|
zhangyuan
|
c88dc8873f
|
灵活统计
|
3 years ago |
HAHA
|
a66304cb76
|
编辑注释
|
3 years ago |
|
jianjun
|
7a426a491e
|
Merge remote-tracking branch 'remotes/origin/dev_party_mange'
|
3 years ago |
|
yinzuomei
|
7f05cb7acd
|
serviceCategoryKey
|
3 years ago |
|
yinzuomei
|
df1865e667
|
Merge remote-tracking branch 'origin/dev_icservice' into dev_icservice
|
3 years ago |
|
yinzuomei
|
0acb40d5a7
|
serviceCategoryKey
|
3 years ago |
|
HAHA
|
c5ce744a15
|
饼图枚举类
|
3 years ago |
Jackwang
|
ec3f9fa678
|
新增一级党组织bug修改
|
3 years ago |
|
jianjun
|
4c11923f2e
|
Merge remote-tracking branch 'remotes/origin/dev_party_mange'
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
# epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
# 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/service/IcPartyUnitService.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.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/IcResiUserImportServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
3 years ago |
|
jianjun
|
37c819b738
|
Merge remote-tracking branch 'remotes/origin/dev_zhili'
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
|
3 years ago |
|
zhangyuan
|
2024ff0127
|
sql bug
|
3 years ago |
zhaoqifeng
|
be88e66eaa
|
党员相关bug修改
|
3 years ago |
|
zhangyuan
|
81b678fa03
|
组织ID取其他表
|
3 years ago |
sunyuchao
|
8aed057c37
|
Merge remote-tracking branch 'origin/dev_icservice' into dev_icservice
|
3 years ago |
|
sunyuchao
|
bcc9b73838
|
服务项目
|
3 years ago |
|
zhangyuan
|
25b3240fd9
|
dateId
|
3 years ago |
|
zhangyuan
|
335f2298cf
|
指定customer表名
|
3 years ago |
YUJT
|
02cc325bf2
|
修改所属支部级联菜单接口
|
3 years ago |
|
yinzuomei
|
7db56d5598
|
Merge remote-tracking branch 'origin/dev_icservice' into dev_icservice
|
3 years ago |
|
yinzuomei
|
f8250fb0b9
|
daimashegnchegn
|
3 years ago |
|
zhangyuan
|
106bf78ee6
|
组织统计时删除历史数据
|
3 years ago |
|
zhaoqifeng
|
7b79f69120
|
Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
|
3 years ago |
|
zhaoqifeng
|
63e25776e8
|
党员相关bug修改
|
3 years ago |
|
HAHA
|
ff6dec398f
|
经纬度
|
3 years ago |
|
zhangyuan
|
1eb6329295
|
增加历史数据删除功能
|
3 years ago |
|
sunyuchao
|
45e6c47223
|
服务项目
|
3 years ago |
|
zhangyuan
|
8aa442d839
|
缺失字段
|
3 years ago |
|
zhangyuan
|
751d1099be
|
检测gridId而非agency
|
3 years ago |
|
zhangyuan
|
0347a88abc
|
统计网格信息
|
3 years ago |
|
Jackwang
|
e05cd75d09
|
支部党组织接口调整
|
3 years ago |
zxc
|
c5149b3f9d
|
修改，上下架
|
3 years ago |
|
wangxianzhang
|
9b5935ba7d
|
修改：客户初始化-初始化项目议题分类的listern，@Autowire注入属性的错误用法
|
3 years ago |
|
sunyuchao
|
cd137d4219
|
Merge branch 'dev_service_syc' into dev_icservice
|
3 years ago |
|
zhangyuan
|
1d18a2482c
|
grid和agency数据统计中
|
3 years ago |
|
zxc
|
7dad033736
|
...
|
3 years ago |
|
zhaoqifeng
|
2ec47cbdd7
|
Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
|
3 years ago |
|
Jackwang
|
b7cf287575
|
获取用户志愿者标识调整
|
3 years ago |
|
zhaoqifeng
|
c09656809b
|
党员所属支部两边存储格式修改
|
3 years ago |
|
zhaoqifeng
|
a5c9222770
|
党员所属支部两边存储格式修改
|
3 years ago |
|
zxc
|
83c4c67eb1
|
...
|
3 years ago |
|
HAHA
|
1acf8a96bb
|
修改统计逻辑
|
3 years ago |
|
HAHA
|
d0e6f50ee7
|
查询条件
|
3 years ago |
|
HAHA
|
e7db65be08
|
饼图
|
3 years ago |
|
HAHA
|
4cd9258577
|
饼图
|
3 years ago |
|
sunyuchao
|
69a19e62d0
|
服务项目模块代码生成
|
3 years ago |
