Tree: 8934db060e

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '8934db060e'

${ noResults }

Commit Graph

10586 Commits (8934db060eb0e78f59fb16c0bde703bc5bb41f4c)

 

All Branches   

Search

Author	SHA1	Message	Date
jianjun	3e1c674112	Merge remote-tracking branch 'origin/dev' into dev	5 years ago
sunyuchao	8ed73ad033	Merge branch 'dev_partymember_bug' into dev	5 years ago
jianjun	52948ca63a	平阴联动平台域名更换	5 years ago
zhaoqifeng	8fbbfe8445	Merge branch 'dev_group_point' into dev_temp	5 years ago
zhaoqifeng	75a31fc9e7	小组成就相关接口	5 years ago
sunyuchao	19edd1c2c0	代码合并问题	5 years ago
zxc	8d8b76f875	小组历史数据查询，未完待续	5 years ago
sunyuchao	e4abc55f55	Merge branch 'dev_group_act_notice' into dev_temp # Conflicts: # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml	5 years ago
sunyuchao	469268347e	因新增组内消息记录表引起的程序变动(新增话题、自动审核、组长审核、屏蔽、取消屏蔽、关闭、删除组员)	5 years ago
yinzuomei	56cdaa827a	Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev	5 years ago
yinzuomei	245d4aa445	bug修改	5 years ago
zxc	795a159078	小组历史数据查询，未完待续	5 years ago
zhaoqifeng	631859ae93	Merge branch 'dev_partymember_bug' into dev_temp # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java	5 years ago
zhaoqifeng	5c310392c2	党员认证判断是否是居民代码修改	5 years ago
zhaoqifeng	0205258072	小组成就相关接口	5 years ago
zhaoqifeng	0dc4f0648f	Merge branch 'dev_group_point' into dev_temp # Conflicts: # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java # epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml	5 years ago
jianjun	89aa8a9e1e	小组成就类型枚举类	5 years ago
sunyuchao	812cdc3571	小组通知添加关于组内消息记录表的维护	5 years ago
yinzuomei	33aa2ba8fd	group_message	5 years ago
yinzuomei	a8fb260144	group_message	5 years ago
yinzuomei	b53077a856	group_message	5 years ago
yinzuomei	eaceda8ed1	发布、编辑、取消、关闭活动记录group_message	5 years ago
yinzuomei	fd314eebec	发布、编辑、取消、关闭活动记录group_message	5 years ago
zhaoqifeng	ea26719820	Merge branch 'dev_partymember_bug' into dev_temp	5 years ago
zhaoqifeng	3224197916	党员认证判断是否是居民代码修改	5 years ago
yinzuomei	5d25fc3f61	operateTime	5 years ago
zhaoqifeng	3fde79668e	Merge branch 'dev_partymember_bug' into dev_temp # Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java # epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java	5 years ago
yinzuomei	e91480c94d	getByMessageId	5 years ago
zhaoqifeng	2c63e3d0aa	党员认证判断是否是居民代码修改	5 years ago
yinzuomei	4515e38692	group_message新增status:	5 years ago
yinzuomei	cb73a8fe7e	group_message代码生成	5 years ago
yinzuomei	108607d2eb	group_message代码生成	5 years ago
yinzuomei	c686a2ba9a	活动相关表+邀请表+消息记录表，sql：group_message	5 years ago
yinzuomei	545c415d30	Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev	5 years ago
yinzuomei	64185ed87a	修改selectGovernCapacityRatioNew 排序	5 years ago
yinzuomei	eb0b86df69	暂存脚本	5 years ago
zhaoqifeng	406ee7d44c	小组成就相关接口	5 years ago
sunyuchao	d308692c58	Merge branch 'dev_group_act_notice' into dev_temp	5 years ago
sunyuchao	1ae66b4f50	小组通知涉及相关db	5 years ago
sunyuchao	f3747eba46	Merge branches 'dev' and 'dev_group_act_notice' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group_act_notice Conflicts: epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java	5 years ago
yinzuomei	5e03eab38f	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp	5 years ago
yinzuomei	952d5039e6	获取签到小程序码	5 years ago
yinzuomei	d7b6d94d1b	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp	5 years ago
yinzuomei	b4ca1ecaac	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice	5 years ago
yinzuomei	59ec40e6cd	获取签到小程序码	5 years ago
zxc	5138d1724f	当前人员未读(通知、活动)列表查询	5 years ago
yinzuomei	54c6c71303	Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev_temp	5 years ago
yinzuomei	90e51332b7	项目分布接口修改	5 years ago
yinzuomei	270be8dc79	Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp	5 years ago
zxc	f57ecc36bf	小组历史数据查询V2 框框	5 years ago