zxc
|
4a40660253
|
立项的项目给0分
|
4 years ago |
jianjun
|
3092366971
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_project_location
|
4 years ago |
zhaoqifeng
|
0cd0e56b58
|
网格员巡查功能接口
|
4 years ago |
wxz
|
ac2a70b2b4
|
Merge branch 'dev_temp' into develop
# Conflicts:
# epmet-admin/epmet-admin-server/pom.xml
|
4 years ago |
|
jianjun
|
687d5cf91a
|
修改更新中心点 按名称左匹配
|
4 years ago |
|
jianjun
|
ed698777dd
|
修改更新中心点 按组织去修改
|
4 years ago |
|
jianjun
|
e3682cb613
|
修改更新中心点的条件 不为空时才修改
|
4 years ago |
|
jianjun
|
8ce33e9a3c
|
修改更新中心点的条件 不为空时才修改
|
4 years ago |
sunyuchao
|
4e93952cb6
|
sql脚本调整
|
4 years ago |
|
wxz
|
6b9d38af94
|
Merge branch 'dev_log' into dev_temp
|
4 years ago |
|
wxz
|
4a5b122061
|
去掉多余import
|
4 years ago |
|
wxz
|
61efb2e21c
|
Merge branch 'dev_log' into dev_temp
|
4 years ago |
|
wxz
|
9e873d2595
|
日志模块，增加ip,app,client,operatorName,operatorMobile字段
|
4 years ago |
|
jianjun
|
426bab927c
|
巡查记录主表脚本文件添加
|
4 years ago |
|
zxc
|
c5c90fd5e9
|
Merge branch 'dev_third_data' into dev_temp
|
4 years ago |
|
zxc
|
9a7fcd3b82
|
群众不满
|
4 years ago |
|
zhaoqifeng
|
16fcf90426
|
网格员巡查功能接口
|
4 years ago |
|
zhaoqifeng
|
e2e77dfb13
|
网格员巡查功能接口
|
4 years ago |
|
sunyuchao
|
54cdfee89b
|
Merge branch 'dev_grid_patrol' into dev_temp
|
4 years ago |
|
sunyuchao
|
cc7b97f37c
|
列表网格名拼接到上两级组织名称，恶心人的玩意
|
4 years ago |
|
zxc
|
0445ece155
|
Merge branch 'dev_grid_patrol' into dev_temp
# 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/CustomerStaffDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
|
4 years ago |
|
wxz
|
cb1d7ef28f
|
Merge branch 'dev_log' into dev_temp
|
4 years ago |
|
wxz
|
422f15f71e
|
调整操作日志接口返回时间戳单位为秒
|
4 years ago |
|
zxc
|
52f8afb276
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_temp
|
4 years ago |
|
zxc
|
28795cfd31
|
分类修改
|
4 years ago |
|
zxc
|
0f6a9e12a7
|
大屏巡查
|
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 |
|
jianjun
|
f569b3adcd
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_patrol
|
4 years ago |
|
wxz
|
2176562b56
|
项目变动增加日志完成
|
4 years ago |
|
jianjun
|
135936f874
|
修改网格中心点时去掉 参数里的委会
|
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 |
|
jianjun
|
4f3ae1e7f7
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3de74d7681
|
项目数据抽取到大屏 设置直接立项的 联系人及电话 其他待调整；修改 获取网格员的条件
|
4 years ago |
|
wxz
|
c7822de9c7
|
完成登录发送事件，记录登录日志
|
4 years ago |
|
jianjun
|
1eb61b3725
|
项目数据抽取到大屏 多余代码注释掉
|
4 years ago |
|
jianjun
|
026851fc2b
|
格式化代码
|
4 years ago |
|
jianjun
|
3a4175d7bb
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
55a3cf5b1e
|
Revert "联建共建bug修改 测试下 看看"
This reverts commit d2ce490f
|
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
|
7b46cac380
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
