jianjun
|
cd15a10e72
|
Revert "主键冲突 服务发布"
This reverts commit 7b8e3907
|
3 years ago |
|
jianjun
|
7b8e3907c9
|
主键冲突 服务发布
|
3 years ago |
zxc
|
e901f70541
|
emm bug
|
3 years ago |
yinzuomei
|
02525ad799
|
zhushixia
|
3 years ago |
|
yinzuomei
|
5155f7b38f
|
/gov/org/house/housedel内部调用/gov/org/house/delete
|
3 years ago |
zhaoqifeng
|
a13573d76b
|
添加事件上报耗时log
|
3 years ago |
|
zhaoqifeng
|
7dddebd243
|
添加事件上报耗时log
|
3 years ago |
|
zhaoqifeng
|
3e304056f0
|
添加事件上报耗时log
|
3 years ago |
|
zxc
|
c187e55c8a
|
人员预警修改
|
3 years ago |
|
zxc
|
4d1334368c
|
格式
|
3 years ago |
|
zxc
|
a2d8facf76
|
表头备注
|
3 years ago |
|
zxc
|
dc2dda83d4
|
注释修改楼栋户数
|
3 years ago |
|
zxc
|
ecb5e5492b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
3 years ago |
wangxianzhang
|
d454af7fcd
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
wangxianzhang
|
2a7d61412c
|
新增
1.居民导入，推送mq消息，进行相关动作
|
3 years ago |
|
zxc
|
1b1f941a56
|
房屋导入修改
|
3 years ago |
|
zxc
|
c7970edbc9
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
zxc
|
410dd207f4
|
bug修复
|
3 years ago |
|
jianjun
|
00591cd10e
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
e03de9c6d8
|
线程池不够用问题
|
3 years ago |
|
jianjun
|
ba6d4d4d29
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
2dd4f1b220
|
id生成重复问题
|
3 years ago |
|
jianjun
|
6625dd2adf
|
测试下
|
3 years ago |
|
jianjun
|
77c7703c2e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
09d19f519b
|
stats 配置driud连接池 修改
|
3 years ago |
|
jianjun
|
238ffa6181
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
26e7db0ca0
|
stats 配置driud连接池
|
3 years ago |
|
jianjun
|
d5ea391a19
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
ce0eb794e2
|
超时打印日志
|
3 years ago |
|
jianjun
|
d3de5f684c
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
33661f258e
|
id 重复 试下
|
3 years ago |
|
jianjun
|
118c930d89
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
7e41369e96
|
消费巡查消息调整
|
3 years ago |
|
jianjun
|
454714c4c1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
fd6135acc1
|
代码微调
|
3 years ago |
|
jianjun
|
3950bc94db
|
导入小区时 更新楼宇的房间数
|
3 years ago |
|
jianjun
|
b5a53e8bdf
|
合并错误
|
3 years ago |
|
yinzuomei
|
51be467c63
|
Merge branch 'wxz_resiimport_temp' into dev
|
3 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
|
3 years ago |
|
jianjun
|
583868b14d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into wxz_resiimport_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
|
3 years ago |
|
jianjun
|
b74a7d5ab1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
ca40bfca12
|
grid缓存不对添加组织名称
|
3 years ago |
|
jianjun
|
f8d9e871fb
|
grid缓存不对
|
3 years ago |
|
zxc
|
e7dbb236b8
|
注释更新户数
|
3 years ago |
|
jianjun
|
14fe68ac54
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
546cb7d6fe
|
grid缓存不对
|
3 years ago |
|
jianjun
|
77068a4714
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
3 years ago |
|
jianjun
|
020df4166f
|
去掉房屋必须填写的 房主信息
|
3 years ago |
|
wangxianzhang
|
e9a2517206
|
改错了啊啊啊
|
3 years ago |
|
wangxianzhang
|
9ab3f3396a
|
Merge remote-tracking branch 'origin/wxz_resiimport_temp' into wxz_resiimport_temp
|
3 years ago |
