jianjun
|
e45b0edce8
|
代码暂存
|
4 years ago |
|
jianjun
|
56eacc1463
|
两个功能权限
|
4 years ago |
zxc
|
0c3d1ad0f1
|
大屏巡查
|
4 years ago |
|
jianjun
|
9d583b720f
|
微调
|
4 years ago |
|
jianjun
|
e980051aae
|
根据名称 模糊修改 网格中心点位
|
4 years ago |
|
jianjun
|
1f6ec7af20
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_patrol
|
4 years ago |
|
jianjun
|
60c96d805c
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
|
jianjun
|
bf8e539e3b
|
修改日志及job的等待时常
|
4 years ago |
sunyuchao
|
89ef245266
|
接口模板
|
4 years ago |
|
sunyuchao
|
eb7d2edf68
|
Merge branch 'dev_project_location' into dev_temp
|
4 years ago |
|
sunyuchao
|
2cc1f533e5
|
人员调动删除可能存在的登陆token
|
4 years ago |
|
zxc
|
3d2371853d
|
生成文件
|
4 years ago |
|
jianjun
|
996dbd50c4
|
user和agg添加巡查基础类
|
4 years ago |
|
zxc
|
78cb2ea3b7
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
zxc
|
c7c8cd0ab4
|
群众不满 分类 bug修复
|
4 years ago |
|
sunyuchao
|
26bbe2920a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_project_location
|
4 years ago |
wxz
|
9d8b4ff382
|
Merge branch 'dev_bugfix_access' into dev_temp
|
4 years ago |
|
wxz
|
353b4a1335
|
Merge branches 'dev' and 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
Conflicts:
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
4 years ago |
|
wxz
|
0bbb169dcd
|
修复：当组织被删除后，用户继续在此组织操作，查询权限的空指针异常
|
4 years ago |
|
sunyuchao
|
35d3def2aa
|
Merge branches 'dev' and 'dev_project_location' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_project_location
|
4 years ago |
|
sunyuchao
|
002d6371c0
|
项目定位首次提交
|
4 years ago |
|
sunyuchao
|
b2d66946e4
|
修改数据库连接密码错误问题
|
4 years ago |
|
jianjun
|
4ac8998d26
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
|
jianjun
|
1c895a9712
|
我也是无敌了
|
4 years ago |
|
jianjun
|
95f0c539de
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
f381a48fa6
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
|
jianjun
|
f3aa032462
|
sql 起别名
|
4 years ago |
|
jianjun
|
70b3244fa8
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
|
jianjun
|
410de4c715
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
675d0574bf
|
终于找到精髓
|
4 years ago |
|
jianjun
|
616c3eff06
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
1f6e7ed3cf
|
逻辑加强判断
|
4 years ago |
|
jianjun
|
c023590e91
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
fd10b15cbb
|
逻辑加强判断
|
4 years ago |
|
jianjun
|
15b8ac1025
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
4 years ago |
|
jianjun
|
14d5ef825a
|
sql加强判断
|
4 years ago |
|
jianjun
|
b9b1637463
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
4 years ago |
|
jianjun
|
2b1ac67340
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
7b561fb3b6
|
先进支部排行查询的是网格 所以关联grid即可
|
4 years ago |
|
jianjun
|
ba8964d9b9
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
4 years ago |
|
jianjun
|
05d723349b
|
dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
ebda5c227b
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
|
4 years ago |
|
jianjun
|
182e232539
|
如果数据id为空 再继续下个月的查询
|
4 years ago |
zhaoqifeng
|
558c664306
|
Merge branch 'dev_point_rank_bugfix' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
387d860506
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zhaoqifeng
|
3d7acb2ac7
|
党员先锋统计修改
|
4 years ago |
|
wxz
|
c67816077a
|
修改nacos,dev和local环境注册的namespace
|
4 years ago |
yinzuomei
|
a7358e9642
|
Merge remote-tracking branch 'origin/screen_project_data_0601' into dev
|
4 years ago |
|
yinzuomei
|
5858cb19d3
|
Merge remote-tracking branch 'origin/screen_project_data_0601' into dev_temp
|
4 years ago |
|
yinzuomei
|
981863afb7
|
网格员数据向上汇聚
|
4 years ago |
