Tree: cbdf6c428e

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'cbdf6c428e'

${ noResults }

Commit Graph

18232 Commits (cbdf6c428e67bd31c278a0aaac70384d77b69c3e)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	cbdf6c428e	org，user升级	4 years ago
zxc	7926c55fbd	org升级	4 years ago
zxc	79ebbd8579	Merge remote-tracking branch 'origin/dev'	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	082af117a4	user-bug修复	4 years ago
zxc	e0934e91ce	Merge remote-tracking branch 'origin/dev'	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	a7f62d3962	Merge remote-tracking branch 'remotes/origin/dev'	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	e75b110ac7	导入小区时 更新楼宇的房间数 up	4 years ago
jianjun	004ea9cd76	Merge remote-tracking branch 'remotes/origin/dev'	4 years ago
jianjun	3950bc94db	导入小区时 更新楼宇的房间数	4 years ago
jianjun	eb97051ebd	Merge remote-tracking branch 'remotes/origin/dev'	4 years ago
jianjun	b5a53e8bdf	合并错误	4 years ago
yinzuomei	c1a89965d7	Merge remote-tracking branch 'origin/dev'	4 years ago
yinzuomei	51be467c63	Merge branch 'wxz_resiimport_temp' into dev	4 years ago
jianjun	a0eb799770	废弃网格+居民导入+房屋导入调整 up	4 years ago
jianjun	09544847c1	Merge remote-tracking branch 'origin/master' # Conflicts: # epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml	4 years ago
jianjun	670ebd4913	修改版本号	4 years ago
jianjun	b13f910f7d	Merge remote-tracking branch 'remotes/origin/dev' # Conflicts: # epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml	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
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	4 years ago
jianjun	b74a7d5ab1	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	ca40bfca12	grid缓存不对添加组织名称	4 years ago
jianjun	f8d9e871fb	grid缓存不对	4 years ago
zxc	e7dbb236b8	注释更新户数	4 years ago
jianjun	14fe68ac54	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
jianjun	546cb7d6fe	grid缓存不对	4 years ago