Tree: 2a73d876b0

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '2a73d876b0'

${ noResults }

Commit Graph

5392 Commits (2a73d876b0762cac38cf84dcd33e0bf1c4d3f46a)

 

All Branches   

Search

Author	SHA1	Message	Date
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	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	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
sunyuchao	8179fcfcee	孔村大屏-邻里党群部分接口	5 years ago
yinzuomei	9d06f21dbb	孔村：删除screen_kc_user_heat_rank_grid_daily表	5 years ago
yinzuomei	f1b15209cd	18、邻里党群-小组详情 接口修改 v2	5 years ago
yinzuomei	0d3f4a5f29	18、邻里党群-小组详情 接口修改	5 years ago
yinzuomei	7848402d64	Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data	5 years ago
yinzuomei	1813d6afa4	孔村采集api修改	5 years ago
wxz	a116e61c91	Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data	5 years ago
wxz	d5ee8b7da8	新增：议题summary+议题趋势图	5 years ago
yinzuomei	a7fa19bf69	topicDataCleaning	5 years ago
jianjun	38ece9f7bf	去掉不该有的注解	5 years ago
jianjun	537fc4355d	统计添加默认数据源	5 years ago
jianjun	eee09a3a1b	维度添加默认数据源	5 years ago
yinzuomei	034ca215ca	话题代码生成	5 years ago
jianjun	07218d8e21	添加部分数据源注解	5 years ago
yinzuomei	9ec9bedc05	新增factorigin	5 years ago
zhaoqifeng	d488187890	订阅消息设置	5 years ago
sunyuchao	fea1a15f61	孔村大屏-公益互助部分接口	5 years ago
yinzuomei	b19799bab7	dim_object_action,dim_object_status代码生成	5 years ago
jianjun	18b6004a0b	Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev	5 years ago
zhaoqifeng	232d5e4e40	订阅消息设置	5 years ago
wxz	21f7d96164	动态数据源增加数据源名称日志	5 years ago
wxz	8b3436d429	动态数据源增加数据源名称日志	5 years ago
yinzuomei	a7ebeffb70	孔村添加两个外部应用	5 years ago
sunyuchao	02a48a1965	孔村大屏接口	5 years ago
zxc	7d8f9497e6	议题主附表相应文件上传	5 years ago
zhaoqifeng	c5640fa902	Ext_Json修改	5 years ago
zhaoqifeng	6edd7a00d2	订阅消息设置	5 years ago
zxc	650736038c	三大能力乘上对应权重，四舍五入提出公共方法	5 years ago
sunyuchao	8c0e505c4c	名称修改	5 years ago