Tree: a286d4030f

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'a286d4030f'

${ noResults }

Commit Graph

16979 Commits (a286d4030f09887a9189a8514afaa5c26ee169ab)

 

All Branches   

Search

Author	SHA1	Message	Date
wangxianzhang	a286d4030f	修改： 1.区块链用户身份认证调整，增加字段，url变化	4 years ago
wangxianzhang	544789dff2	Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_blockchain	4 years ago
wangxianzhang	468ff87bb5	新增： 1.【区块链】区块链web界面用户身份认证	4 years ago
jianjun	d6224c4626	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	a48f50b6b7	动力网格 市北专属	4 years ago
jianjun	2a2ce3d23f	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
jianjun	46fbe3b38f	动力网格 市北专属	4 years ago
zhaoqifeng	c191724ce8	项目管理-全部项目列表查询	4 years ago
jianjun	43d61dde0d	动力网格 市北专属	4 years ago
zxc	564f8ef162	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
zxc	c21042acc8	yitibiaojue	4 years ago
zxc	41e2f9f899	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
zxc	3182879841	小组组织日统计还原	4 years ago
zxc	d2c2e5cf03	议题表决日统计	4 years ago
zxc	a3ce3f765c	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev	4 years ago
zxc	d071898560	议题统计暂提	4 years ago
zxc	f4c9672e5b	小组机关日统计	4 years ago
sunyuchao	3fae4181be	Merge branch 'dev_bugfix_ljj' into dev	4 years ago
sunyuchao	494f75aa27	分页方法调用调整	4 years ago
zxc	64620db2ec	议题表决日统计	4 years ago
jianjun	7b0260362d	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
jianjun	3fc9b0b077	去掉mock数据	4 years ago
jianjun	6d1e55e7ca	Merge remote-tracking branch 'remotes/origin/dev_shibei_project_catagory' into dev # Conflicts: # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java # epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java # epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml	4 years ago
jianjun	c31f526c0b	Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev	4 years ago
sunyuchao	a023ee03eb	项目分类分析右侧列表所属网格调整为所属组织	4 years ago
sunyuchao	6b1b3a4449	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
sunyuchao	062a1e5f8d	again	4 years ago
zhaoqifeng	1a34993e41	脚本	4 years ago
wangxianzhang	32b1be10dc	谁误删了.gitignore，这里找回来了	4 years ago
jianjun	772752b9be	数字社区平台 1级项目分类数量 从业务库直接查询	4 years ago
sunyuchao	28268653a5	..	4 years ago
zhaoqifeng	2e85c54acf	Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj	4 years ago
zhaoqifeng	6396bd646b	备注	4 years ago
sunyuchao	763edcd766	项目机关日统计程序优化	4 years ago
zhaoqifeng	0fad17e961	计算两个日期之间的时间差(只包括工作日) 修改	4 years ago
yinzuomei	41b5936dfe	Merge remote-tracking branch 'origin/dev_ic_mp' into dev	4 years ago
yinzuomei	d03f5f73a2	ic_user_demand_service添加server_name；指派和接单接口赋值	4 years ago
yinzuomei	82c064db11	ic_user_demand_service添加server_name；指派和接单接口赋值	4 years ago
zxc	bdc99114b7	groupAgencyDaily方法优化	4 years ago
zxc	320757ed8b	statsGroupGridDailyTask优化	4 years ago
zhaoqifeng	3215e83a7f	项目列表bug修改 项目添加项目耗时字段	4 years ago
sunyuchao	15216eccf6	机关项目日统计程序调整优化	4 years ago
sunyuchao	3943cf716e	Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj Conflicts: epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java	4 years ago
jianjun	79516f3c1d	例行工作次数导出	4 years ago
sunyuchao	409c43269f	机关项目日统计程序调整优化	4 years ago
wangxianzhang	7fb8931d59	版本升级	4 years ago
wangxianzhang	88a40db14f	Merge branch 'dev'	4 years ago
wangxianzhang	e38414ea73	Merge branch 'wxz_blockchain' into dev	4 years ago
zhaoqifeng	e30be3252a	项目列表bug修改 项目添加项目耗时字段	4 years ago
zhaoqifeng	f2b2c08334	项目列表bug修改 项目添加项目耗时字段	4 years ago