jianjun
|
4e7027d46a
|
up
|
4 years ago |
|
jianjun
|
321ada6df2
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
|
4 years ago |
|
jianjun
|
47199dac03
|
Merge branch 'dev_oper_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
da247b3beb
|
导出查询组织like吧
|
4 years ago |
|
jianjun
|
56c7d82b54
|
Merge remote-tracking branch 'remotes/origin/dev_oper_export' into dev
|
4 years ago |
|
jianjun
|
d50e63628d
|
导出运营数据 网格
|
4 years ago |
|
jianjun
|
047205cf35
|
导出运营数据 网格
|
4 years ago |
|
jianjun
|
7baca77d87
|
导出运营数据 网格
|
4 years ago |
zxc
|
4d1334368c
|
格式
|
4 years ago |
|
zxc
|
a2d8facf76
|
表头备注
|
4 years ago |
|
zxc
|
dc2dda83d4
|
注释修改楼栋户数
|
4 years ago |
|
zxc
|
ecb5e5492b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
wangxianzhang
|
d454af7fcd
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
wangxianzhang
|
2a7d61412c
|
新增
1.居民导入，推送mq消息，进行相关动作
|
4 years ago |
|
zxc
|
1b1f941a56
|
房屋导入修改
|
4 years ago |
|
zxc
|
c7970edbc9
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
410dd207f4
|
bug修复
|
4 years ago |
|
jianjun
|
00591cd10e
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e03de9c6d8
|
线程池不够用问题
|
4 years ago |
|
jianjun
|
ba6d4d4d29
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
2dd4f1b220
|
id生成重复问题
|
4 years ago |
|
jianjun
|
6625dd2adf
|
测试下
|
4 years ago |
|
jianjun
|
77c7703c2e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
09d19f519b
|
stats 配置driud连接池 修改
|
4 years ago |
|
jianjun
|
238ffa6181
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
26e7db0ca0
|
stats 配置driud连接池
|
4 years ago |
|
jianjun
|
d5ea391a19
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
ce0eb794e2
|
超时打印日志
|
4 years ago |
|
jianjun
|
d3de5f684c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
33661f258e
|
id 重复 试下
|
4 years ago |
|
jianjun
|
118c930d89
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
7e41369e96
|
消费巡查消息调整
|
4 years ago |
|
jianjun
|
454714c4c1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
fd6135acc1
|
代码微调
|
4 years ago |
|
jianjun
|
0e3e96f94f
|
导入小区时 更新楼宇的房间数 up
|
4 years ago |
|
jianjun
|
6b42b19b37
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
|
4 years ago |
|
jianjun
|
3950bc94db
|
导入小区时 更新楼宇的房间数
|
4 years ago |
|
jianjun
|
0254aa56db
|
stats添加数据源index up
|
4 years ago |
|
jianjun
|
17f31d1abe
|
stats添加数据源index up
|
4 years ago |
|
jianjun
|
e273b0aeab
|
stats添加数据源index
|
4 years ago |
|
jianjun
|
8f7140a860
|
stats失败
|
4 years ago |
|
jianjun
|
abd6a84585
|
shibail
|
4 years ago |
|
jianjun
|
cd0d7a768e
|
合并错误u
|
4 years ago |
|
jianjun
|
428eadff16
|
合并错误u
|
4 years ago |
|
jianjun
|
8adf77447a
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
|
4 years ago |
|
jianjun
|
b5a53e8bdf
|
合并错误
|
4 years ago |
|
jianjun
|
1f1cfc17d3
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北生产
# Conflicts:
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
# epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
|
4 years ago |
|
jianjun
|
23621c90ba
|
废弃网格+居民导入+房屋导入调整 up
|
4 years ago |
yinzuomei
|
51be467c63
|
Merge branch 'wxz_resiimport_temp' into dev
|
4 years ago |
|
jianjun
|
403777271d
|
Merge remote-tracking branch 'remotes/origin/dev_abandon_grid' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
|
4 years ago |
