Tree: bc82395bc6

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'bc82395bc6'

${ noResults }

Commit Graph

9813 Commits (bc82395bc6ba1df1bed3ba746b2a54d826d2e0d9)

 

All Branches   

Search

Author	SHA1	Message	Date
zxc	23fdabfe0d	Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen	5 years ago
zxc	d7dfd41f5f	党员基本情况-年龄分布 修改	5 years ago
zhaoqifeng	23184829cd	Merge remote-tracking branch 'origin/dev_pyscreen' into dev_pyscreen	5 years ago
zhaoqifeng	293dbe25c5	【事件分析】类型分析 【事件/项目分析】按类别统计	5 years ago
jianjun	e267762ee4	错误修改	5 years ago
jianjun	18e0cff3ab	Merge remote-tracking branch 'remotes/origin/dev' into dev_pyscreen # Conflicts: # epmet-auth/src/main/java/com/epmet/dto/form/SsoLoginFormDTO.java # epmet-auth/src/main/java/com/epmet/service/SsoService.java # epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java	5 years ago
jianjun	951bb35228	平阴联动平台 登陆pc工作端接口	5 years ago
zxc	2a7ed4a1aa	crm引入	5 years ago
yinzuomei	0be9eb0fa4	新增项目分布接口供龙湾调用	5 years ago
yinzuomei	9350f079b7	Merge remote-tracking branch 'origin/dev_areaCode' into dev_pyscreen	5 years ago
yinzuomei	33485b07d9	Merge remote-tracking branch 'origin/dev_areaCode' into dev	5 years ago
yinzuomei	c799f07949	工作日志采集接口添加orgName	5 years ago
yinzuomei	7e695cdbde	修改api/commonservice/externalapp/get-jwt-accesstoken接口方便测试	5 years ago
yinzuomei	b8c24cd20f	工作日志采集接口修改	5 years ago
yinzuomei	3db7624cd6	Merge remote-tracking branch 'origin/dev_areaCode' into dev_pyscreen # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java	5 years ago
yinzuomei	da4e58bee7	Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_areaCode # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java	5 years ago
yinzuomei	f82c704bdb	Merge remote-tracking branch 'origin/dev_areaCode' into dev # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java	5 years ago
yinzuomei	a42ec8cb64	queryStaffPermissionV2修改	5 years ago
yinzuomei	7911880c62	工作日志大屏API	5 years ago
yinzuomei	da96b58174	工作日志采集API	5 years ago
yinzuomei	8b203dd918	Merge remote-tracking branch 'origin/dev_areacode_dict' into dev	5 years ago
yinzuomei	932aa11b38	新增area_code修改	5 years ago
zxc	8be404bf4c	公用DTO上传	5 years ago
sunyuchao	d7cc084382	Merge branch 'dev_jcet' into dev	5 years ago
sunyuchao	2aff053d0e	酒城H5工作端登陆两个获取token接口	5 years ago
yinzuomei	e5f6ad08ad	Merge remote-tracking branch 'origin/dev_areaCode' into dev	5 years ago
yinzuomei	f4ad94db7b	sql脚本修改	5 years ago
yinzuomei	7fd834477d	Merge remote-tracking branch 'origin/dev_areaCode' into dev # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java # epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java # epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java # epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java # epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java	5 years ago
yinzuomei	3c64fcc666	工作日志删除participateTotal列	5 years ago
yinzuomei	25518643f7	Merge remote-tracking branch 'origin/dev_areacode_dict' into dev	5 years ago
yinzuomei	f1c13d2471	平阴事件分析-事件类型分析错误代码删除。3	5 years ago
yinzuomei	94e7c4c055	平阴事件分析-事件类型分析错误代码删除。2	5 years ago
yinzuomei	fee2c4547c	平阴事件分析-事件类型分析错误代码删除。	5 years ago
yinzuomei	a0d7671bf1	工作日志删除/data/stats/plugins/workrecord/grid-monthly接口	5 years ago
yinzuomei	3d95f062e0	add /data/report/screen/agency/addstreetcomm api v3	5 years ago
yinzuomei	1f8905fd24	add /data/report/screen/agency/addstreetcomm api v2	5 years ago
yinzuomei	b51412b6f0	大屏工作日志相关输出接口 todo	5 years ago
yinzuomei	f28a86dd82	工作日志新增按日统计采集接口v2:screen_work_record_org_monthly、screen_work_record_org_daily去掉parentId	5 years ago
yinzuomei	664c57387d	工作日志新增按日统计采集接口v1暂存	5 years ago
yinzuomei	4444fcd625	add /data/report/screen/agency/addstreetcomm api v1	5 years ago
yinzuomei	0ecae3f05f	add /data/report/screen/agency/addstreetcomm api	5 years ago
wangchao	f23d31a9db	workrecord接口修改	5 years ago
yinzuomei	6901e30030	Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_areaCode	5 years ago
yinzuomei	8c72895a78	Merge remote-tracking branch 'origin/dev_areacode_dict' into dev	5 years ago
yinzuomei	88e4b34298	行政地区编码查询接口修改，返回parentCode	5 years ago
yinzuomei	9c4ef8a756	queryStaffAgencyTree方法修改	5 years ago
zxc	fa19fb22aa	Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_temp	5 years ago
zxc	cb1ef62f8f	parentCode	5 years ago
yinzuomei	6045a406d7	screen_customer_agency新增parent_area_code;screen_customer_grid|dept新增area_code; 调整三个表的初始化任务（evaIndexScreenDimInitTask)接口路径：(eidim/init-all)	5 years ago
yinzuomei	aa56cbbd86	screen_customer_agency表新增parent_area_code列;对应修改组织信息采集接口(screen_screencoll/customeragency)	5 years ago