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 |
zhaoqifeng
|
be88e66eaa
|
党员相关bug修改
|
3 years ago |
YUJT
|
02cc325bf2
|
修改所属支部级联菜单接口
|
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 |
|
Jackwang
|
e05cd75d09
|
支部党组织接口调整
|
3 years ago |
wangxianzhang
|
9b5935ba7d
|
修改：客户初始化-初始化项目议题分类的listern，@Autowire注入属性的错误用法
|
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 |
|
HAHA
|
1acf8a96bb
|
修改统计逻辑
|
3 years ago |
|
HAHA
|
d0e6f50ee7
|
查询条件
|
3 years ago |
|
HAHA
|
e7db65be08
|
饼图
|
3 years ago |
|
HAHA
|
4cd9258577
|
饼图
|
3 years ago |
|
zhaoqifeng
|
0ade16d689
|
党员只能建在支部上，志愿者抽取逻辑修改
|
3 years ago |
|
HAHA
|
bdbcc02f55
|
增加查询字段
|
3 years ago |
|
Jackwang
|
fcf20b2695
|
Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
|
3 years ago |
|
Jackwang
|
d2892ba276
|
党员接口新增字段
|
3 years ago |
|
HAHA
|
201c641e9e
|
排错
|
3 years ago |
|
HAHA
|
260fbe6201
|
修改字段，分页，统计数值
|
3 years ago |
|
Jackwang
|
ebec56fea2
|
党组织树sql调整
|
3 years ago |
|
Jackwang
|
4ae2b4ad67
|
branchList接口调整
|
3 years ago |
|
HAHA
|
ee9b5f9e6c
|
改bug
|
3 years ago |
sunyuchao
|
08bcfbfc08
|
。。。
|
3 years ago |
|
sunyuchao
|
e72df9975f
|
。。。
|
3 years ago |
|
Jackwang
|
3b5d697411
|
党组织树新增参数
|
3 years ago |
|
sunyuchao
|
bc39b28708
|
。。。
|
3 years ago |
|
YUJT
|
31c7344283
|
custom模块新增flyway脚本
|
3 years ago |
|
HAHA
|
659bfca380
|
【网格党建平面图】列表查询条件
|
3 years ago |
|
HAHA
|
6518fd43fc
|
flyaway脚本
|
3 years ago |
yinzuomei
|
10513cdeb2
|
voice：duration
|
3 years ago |
|
HAHA
|
e3afce6e24
|
【网格党建平面图】饼图逻辑
|
3 years ago |
|
HAHA
|
2b4005f182
|
修改量化积分获取方式
|
3 years ago |
|
HAHA
|
da85ba0feb
|
添加修改时间
|
3 years ago |
|
HAHA
|
fcd2a851df
|
修改居民地理坐标信息逻辑
|
3 years ago |
|
HAHA
|
b96d4e8eed
|
修改经纬度customerId
|
3 years ago |
|
HAHA
|
8ea57b61ef
|
修改统计逻辑
|
3 years ago |
|
yinzuomei
|
7573835b2b
|
支援者类别治安巡逻员
|
3 years ago |
|
HAHA
|
d4ed69c876
|
统计改错地方
|
3 years ago |
|
HAHA
|
eab6adb518
|
代码求和改为sql求和
|
3 years ago |
|
Jackwang
|
e5b624e4c0
|
新增党组织校验行政组织类型校验
|
3 years ago |
|
HAHA
|
58e2572244
|
导出总数，所有基础数据相加
|
3 years ago |
|
zhaoqifeng
|
c848f40275
|
党员相关bug修改
|
3 years ago |
|
wangxianzhang
|
70dc6ae78f
|
增加flyway脚本：隐藏旧的event事件footbar
|
3 years ago |
|
zhaoqifeng
|
bfbf55fe4f
|
Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
|
3 years ago |
|
zhaoqifeng
|
e02730cfb1
|
党员相关bug修改
|
3 years ago |
