zxc
|
52f8afb276
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
zxc
|
28795cfd31
|
分类修改
|
4 years ago |
wxz
|
cbc75d2c03
|
Merge branch 'dev_log' into dev_temp
# Conflicts:
# epmet-auth/pom.xml
|
4 years ago |
|
wxz
|
f9a344633e
|
调整auth-client层级关系
|
4 years ago |
|
wxz
|
8d0ce728b8
|
-
|
4 years ago |
|
wxz
|
eb4414f48f
|
Merge branch 'dev_log' into dev_temp
# Conflicts:
# epmet-auth/pom.xml
|
4 years ago |
|
wxz
|
39d1645fe3
|
项目变动ddl修改
|
4 years ago |
|
wxz
|
3cb8dbc460
|
项目变动增加日志，补充提交
|
4 years ago |
|
wxz
|
2176562b56
|
项目变动增加日志完成
|
4 years ago |
sunyuchao
|
5f90043f70
|
Merge branch 'dev_project_location' into dev_temp
|
4 years ago |
|
sunyuchao
|
3f39233214
|
取值错误修改
|
4 years ago |
|
sunyuchao
|
d584fc2835
|
修改sql版本冲突
|
4 years ago |
|
wxz
|
bd83b4ab6b
|
完善登录日志，增加异常处理
|
4 years ago |
|
wxz
|
c7822de9c7
|
完成登录发送事件，记录登录日志
|
4 years ago |
|
sunyuchao
|
85e6ba55d2
|
Merge branch 'dev_grid_patrol' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
|
4 years ago |
|
sunyuchao
|
b7c4ba41b4
|
巡查-001、各人员巡查记录列表查询
|
4 years ago |
|
wxz
|
f8ab3ffd81
|
增加系统日志监听器&日志查询接口
|
4 years ago |
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 |
