Tree: eff02b75da

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'eff02b75da'

${ noResults }

Commit Graph

16252 Commits (eff02b75da6c365d1707c9bf33a4289f492bf9e6)

 

All Branches   

Search

Author	SHA1	Message	Date
yinzuomei	44dde98632	完成+评价记录日志	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
sunyuchao	d53b46c323	null	4 years ago
sunyuchao	b5300abfc5	消息枚举类	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
sunyuchao	d333beb9bc	组织、部门、网格添加编码、负责人、电话、网格类型字段	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
zxc	d8cefaf5de	来源网格的，已结案的项目，满意度分数默认80	4 years ago
wangxianzhang	ca068bdff3	Merge branch 'dev' into dev_ic_data # Conflicts: # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java	4 years ago
wangxianzhang	08322393ac	Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java	4 years ago
wangxianzhang	a406d0e22c	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop Conflicts: epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java	4 years ago
jianjun	0e58294aae	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev	4 years ago
jianjun	9dec466f4c	组织中心点位获取 up	4 years ago
jianjun	f2b26d1e2f	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	3e0b7a4434	组织中心点位获取	4 years ago
wangxianzhang	40cfae724a	Merge remote-tracking branch 'origin/dev' into dev	4 years ago
wangxianzhang	02002fe33f	修改居民excel导入后的文件名	4 years ago
zhaoqifeng	f6b73d099b	Merge branch 'dev_agency_govern_daily' into dev	4 years ago
zhaoqifeng	22fa5550f7	治理指数统计修改	4 years ago
jianjun	65c8ee4f22	Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj	4 years ago
zxc	5db2e6c3e6	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
zxc	3c278d2543	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
zxc	70ac51304c	难点堵点分数修改 满意度分数默认值80	4 years ago
zhaoqifeng	1daa6270bb	Merge branch 'dev_agency_govern_daily' into dev	4 years ago
zxc	bfc6292071	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
zxc	13bd6e4340	难点堵点加分数字段	4 years ago
sunyuchao	966c89bda1	Merge branch 'dev_bugfix_ljj' into dev	4 years ago
sunyuchao	9c115a708e	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
sunyuchao	e3e33c0b7f	应胡科家要求将平阴之前居民端热心居民改为网格员的在改回去，前期要求改的是胡小雷、林伟伟	4 years ago
jianjun	11680926f8	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
jianjun	364955346a	删除模版	4 years ago
zxc	9992e43e32	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop	4 years ago
zxc	5527271138	难点堵点加分数字段	4 years ago
yinzuomei	9bb0ac0dba	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago