jianjun
|
bf4192e2f0
|
项目数据抽取到大屏 设置直接立项的 联系人及电话 其他待调整；修改 获取网格员的条件-》上线
|
4 years ago |
|
jianjun
|
cf6a0d9964
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
4f3ae1e7f7
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3de74d7681
|
项目数据抽取到大屏 设置直接立项的 联系人及电话 其他待调整；修改 获取网格员的条件
|
4 years ago |
|
jianjun
|
1eb61b3725
|
项目数据抽取到大屏 多余代码注释掉
|
4 years ago |
|
jianjun
|
adfd995246
|
联建共建bug修改 测试下 看看 恢复代码，上线
|
4 years ago |
|
jianjun
|
be2a81085b
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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 |
|
jianjun
|
ef1c19ba56
|
联建共建bug修改 测试下 看看 上线
|
4 years ago |
|
jianjun
|
865eb45795
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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 |
|
jianjun
|
d2ce490fd9
|
联建共建bug修改 测试下 看看
|
4 years ago |
|
jianjun
|
29b5dc0c3c
|
数据3 分类 群众不满bug 上线
|
4 years ago |
|
jianjun
|
f5503dc13d
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
60c96d805c
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
|
jianjun
|
6c2950c00a
|
修改日志及job的等待时常 job+stats 上线，慢的问题 待优化
|
4 years ago |
|
jianjun
|
09a43eacea
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
bf8e539e3b
|
修改日志及job的等待时常
|
4 years ago |
zxc
|
c7c8cd0ab4
|
群众不满 分类 bug修复
|
4 years ago |
wxz
|
0d35d2c533
|
版本升级
|
4 years ago |
|
wxz
|
ac6220b2dd
|
Merge branch 'dev'
|
4 years ago |
|
wxz
|
0bbb169dcd
|
修复：当组织被删除后，用户继续在此组织操作，查询权限的空指针异常
|
4 years ago |
sunyuchao
|
30aa9cf7d8
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
b2d66946e4
|
修改数据库连接密码错误问题
|
4 years ago |
|
sunyuchao
|
b408273d36
|
代码还原，去dev分支修改
|
4 years ago |
|
jianjun
|
397eecdf66
|
我也是无敌了
|
4 years ago |
|
jianjun
|
5cc7107da5
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
3bd204d219
|
sql 起别名 上线
|
4 years ago |
|
jianjun
|
84ae83df16
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
a6f38f3f26
|
null上线
|
4 years ago |
|
jianjun
|
9ced55f184
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
70b3244fa8
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev
|
4 years ago |
|
jianjun
|
675d0574bf
|
终于找到精髓
|
4 years ago |
|
jianjun
|
1f6e7ed3cf
|
逻辑加强判断
|
4 years ago |
|
jianjun
|
fd10b15cbb
|
逻辑加强判断
|
4 years ago |
|
jianjun
|
14d5ef825a
|
sql加强判断
|
4 years ago |
|
sunyuchao
|
dcc579b617
|
数据库连接密码错误问题
|
4 years ago |
|
sunyuchao
|
615d348ee3
|
数据库连接密码错误问题
|
4 years ago |
|
sunyuchao
|
eab341d02c
|
第三版数据合生产
|
4 years ago |
|
jianjun
|
8367ce15ec
|
这些脚本已执行
|
4 years ago |
|
jianjun
|
8ee363bdc6
|
数据3.0上线
|
4 years ago |
|
jianjun
|
3b436e8050
|
Merge remote-tracking branch 'remotes/origin/dev'
|
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
|
7b561fb3b6
|
先进支部排行查询的是网格 所以关联grid即可
|
4 years ago |
|
jianjun
|
5b323b6fde
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
