Tree: d7e571d9d2

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'd7e571d9d2'

${ noResults }

Commit Graph

16179 Commits (d7e571d9d2fc5b51adada69da2f8ffb26dd4b3bb)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	d7e571d9d2	Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into develop	4 years ago
jianjun	34ca3d902a	例行工作 flyway 脚本	4 years ago
jianjun	abfb1eb13a	Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_user_work	4 years ago
jianjun	97d6b70289	例行工作添加接口	4 years ago
jianjun	9008ae53a1	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	69bd99790e	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop	4 years ago
jianjun	3f9d3fe330	巡查最小上报间隔改为3分钟	4 years ago
jianjun	3b147341e2	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
jianjun	6197b70ca1	Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	2f916a7fee	多一个属性 怕啥	4 years ago
jianjun	0f973b472d	多一个属性 怕啥	4 years ago
zxc	39c13a0b8c	Merge remote-tracking branch 'origin/dev_ic_data' into dev	4 years ago
jianjun	e9f06b6fd8	Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	a6bf321d35	去掉还不行 那就返回吧	4 years ago
jianjun	cf49fdd9e8	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	72769c02b0	Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	b3307783b9	添加例行工作暂存	4 years ago
jianjun	416640b36d	系统字典添加 返回pValue	4 years ago
wangxianzhang	7d8856dfb7	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
wangxianzhang	5aebe9cee8	Merge branch 'dev' into develop	4 years ago
wangxianzhang	e29db03d3b	修改： 1.楼栋管理，楼栋列表排列顺序：按创建时间正序，先添加的在上面，后添加的在下面	4 years ago
jianjun	1e327df41f	Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	447035ca0a	Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
wangxianzhang	55f47ba150	Merge branch 'wxz_dim_sync' into develop	4 years ago
jianjun	0eb3a67001	系统字典添加 获取树形结构的方法	4 years ago
wangxianzhang	74b1680c0f	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync	4 years ago
wangxianzhang	ccb95c5c5c	新增： 1.同步漏掉的历史grid，agency,department维度到维度表，查漏补缺	4 years ago
jianjun	8099cb5e46	Merge remote-tracking branch 'origin/develop' into develop	4 years ago
jianjun	204c2bb148	Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	96e9a3cc37	系统字典添加 获取树形结构的方法	4 years ago
zxc	56927d5e35	Merge remote-tracking branch 'origin/dev_ic_data' into develop	4 years ago
jianjun	e003e6c325	Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into develop # Conflicts: # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java	4 years ago
jianjun	cc103a434c	系统字典添加 父级字段	4 years ago
jianjun	2d03856f1e	Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_user_work	4 years ago
zxc	173ce4a0ef	resibuzz优化查询	4 years ago
jianjun	be92c16cfd	bug修改	4 years ago
jianjun	b21fa3c943	Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj	4 years ago
wangxianzhang	f4c3a6a88a	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
wangxianzhang	27362b45cb	修改： auth的serviceListChangedListening选项忘记配置到yml中	4 years ago
jianjun	393ce22f97	数据3版 删掉已经执行的sql	4 years ago
jianjun	b3efd84077	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop	4 years ago
jianjun	b557ce76ce	巡查记录	4 years ago
wangxianzhang	b26621f899	1	4 years ago
jianjun	b9351a262d	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop	4 years ago
jianjun	f2b8ab3ffc	巡查记录添加地址设置	4 years ago
wangxianzhang	ccdbe0818e	修改： 1.因为错误的分之合并，将区块链分支合并到了线上分支，暂时屏蔽掉具体处理，只接受参数	4 years ago
jianjun	ab5f11c2e5	Merge remote-tracking branch 'remotes/origin/dev_ic_data' into dev # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java	4 years ago
wangxianzhang	aafeb78854	Merge branch 'dev_resi_template_download' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java	4 years ago
wangxianzhang	31aa37d650	新增： 1.ic居民信息导入所用excel模板下载	4 years ago
zxc	2efeec31ed	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago