Tree: c2f8c4c994

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'c2f8c4c994'

${ noResults }

Commit Graph

6210 Commits (c2f8c4c994e6cd9fce7286d58a18cde76fce8d2c)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	8df3145445	三大能力求和四舍五入	5 years ago
yinzuomei	8d7d55debf	话题暂存	5 years ago
yinzuomei	2373259a21	话题暂存	5 years ago
jianjun	a76724678a	部署report，stits	5 years ago
jianjun	3db9af315b	Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev	5 years ago
zxc	b4f7add54c	sql补漏	5 years ago
jianjun	c984214db1	部署report，stits	5 years ago
jianjun	4d5cefa948	Merge remote-tracking branch 'remotes/origin/dev' # Conflicts: # epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml # epmet-module/data-report/data-report-server/pom.xml # epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml # epmet-module/data-statistical/data-statistical-server/pom.xml	5 years ago
jianjun	e487bc7a9c	部署report，stits	5 years ago
jianjun	3afa01dbfa	Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev	5 years ago
jianjun	cd217f2030	平均值的 不需要 再次归一计算了 只需要乘以权重	5 years ago
zxc	c42e3b2377	小数修改	5 years ago
jianjun	823c3570f0	下级组织/部门指数排行 去掉 部门的数据	5 years ago
yinzuomei	1afba4bbe6	Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0	5 years ago
yinzuomei	d77bb61d27	解决报错	5 years ago
zxc	72a0ef2529	议题主表	5 years ago
sunyuchao	3cb4d7e6e0	孔村大屏接口自测问题修改	5 years ago
jianjun	7e096b89d6	在部署下	5 years ago
jianjun	a9b2ae536e	Merge remote-tracking branch 'remotes/origin/dev'	5 years ago
jianjun	d2f935e77d	Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev	5 years ago
jianjun	098c4d0e2e	没有总分	5 years ago
jianjun	f21cbe4aea	Merge remote-tracking branch 'remotes/origin/dev'	5 years ago
jianjun	aa1b78bd9a	Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev	5 years ago
jianjun	81ac10db52	修改错误	5 years ago
jianjun	93529bfcab	Merge remote-tracking branch 'remotes/origin/dev'	5 years ago
jianjun	c79b746970	Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev	5 years ago
wxz	c77b0495d9	补充合并丢失的@Autowired	5 years ago
yinzuomei	be3dc766de	话题暂存v0.1-hebing	5 years ago
wxz	5ab01b2488	Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data Conflicts: epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java	5 years ago
yinzuomei	51b6588c18	Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0 # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/TopicService.java # epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml	5 years ago
wxz	aee7e9e134	孔村大屏-项目-还剩最后一个接口	5 years ago
yinzuomei	23fb72f96d	话题暂存v0.1	5 years ago
jianjun	dabf594c83	修改错误	5 years ago
jianjun	af0cf3fb10	Merge remote-tracking branch 'remotes/origin/dev'	5 years ago
jianjun	acd509fe24	Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev	5 years ago
jianjun	cce73f07e5	修改错误	5 years ago
zxc	f385d21df9	议题主表，公共方法添加 根据dateId获取时间集合	5 years ago
jianjun	81aabc52a4	修改错误	5 years ago
jianjun	4e7e15dde7	Merge remote-tracking branch 'remotes/origin/dev'	5 years ago
jianjun	92f957c01b	Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev	5 years ago
jianjun	4d77a18708	修改错误	5 years ago
jianjun	0e5981c4f6	修改错误	5 years ago
jianjun	4d87c792b0	Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev	5 years ago
jianjun	d1226a2d4b	修改错误	5 years ago
sunyuchao	4e60223a0d	孔村大屏-邻里党群部分接口	5 years ago
yinzuomei	59142089ba	Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data	5 years ago
yinzuomei	f374b582d7	孔村：group/detail接口修改	5 years ago
wxz	5caa4850b8	补充因为合并代码导致的@Autowired丢失	5 years ago
wxz	89280a2d51	Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data Conflicts: epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java	5 years ago
wxz	1199124cce	完成孔村议题大屏相关接口	5 years ago