zxc
							
						 | 
						
							
							
							
								
							
								8872c4c047
								
							
								
							
						 | 
						
							
							
								
								time
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								12407567ca
								
							
								
							
						 | 
						
							
							
								
								加个反参
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a26e94b74f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								074f292b07
								
							
								
							
						 | 
						
							
							
								
								新增/修改日程,不需要发消息;改为定时任务去检索,提醒日期=当前日期的日程,统一发送消息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cb1fc07125
								
							
								
							
						 | 
						
							
							
								
								加个反参
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								af06a1c8e6
								
							
								
							
						 | 
						
							
							
								
								加个反参
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								511f1813c5
								
							
								
							
						 | 
						
							
							
								
								加个字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								3e140df253
								
							
								
							
						 | 
						
							
							
								
								同一小区下楼栋不重名
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a70340792b
								
							
								
							
						 | 
						
							
							
								
								getScheduleAndActCount
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								663f146cdd
								
							
								
							
						 | 
						
							
							
								
								居民端党员信息认证提交时 自动校验改为去数字平台党员库查询且只按身份证号校验是否党员
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								379b845f6f
								
							
								
							
						 | 
						
							
							
								
								日程列表、导出
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								336a54e3c9
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								77c87d567a
								
							
								
							
						 | 
						
							
							
								
								CREATED_TIME
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								478688d776
								
							
								
							
						 | 
						
							
							
								
								method
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0e300994b6
								
							
								
							
						 | 
						
							
							
								
								method
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								08f3eead23
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								de1f04cb89
								
							
								
							
						 | 
						
							
							
								
								method
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3a3e10bd60
								
							
								
							
						 | 
						
							
							
								
								/icSchedule/list
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b6e18528c4
								
							
								
							
						 | 
						
							
							
								
								日程列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b20243c6d0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0d655142c6
								
							
								
							
						 | 
						
							
							
								
								活动删除或者日程删除,不用再发消息。
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								d2cebe0188
								
							
								
							
						 | 
						
							
							
								
								党建积分记录修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								750e4f461f
								
							
								
							
						 | 
						
							
							
								
								消息列表创建时间倒叙
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3191ab7a0e
								
							
								
							
						 | 
						
							
							
								
								活动已删除
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e1dc11197f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								51b6a93e99
								
							
								
							
						 | 
						
							
							
								
								emm
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								56ec73a98c
								
							
								
							
						 | 
						
							
							
								
								签到记录倒序
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								efd782aecb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b58cdd3a23
								
							
								
							
						 | 
						
							
							
								
								joinOrgPathShow
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c0e90a93b4
								
							
								
							
						 | 
						
							
							
								
								log
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								5c5f0904f7
								
							
								
							
						 | 
						
							
							
								
								【指挥调度】疫苗接种点的查询,不根据组织查询,只根据客户查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1b2c0b0063
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								be7b1655b9
								
							
								
							
						 | 
						
							
							
								
								党建积分修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								40b64d2711
								
							
								
							
						 | 
						
							
							
								
								党建积分规则初始化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								dba8740a30
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								34d791f74a
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e2a4a8dddc
								
							
								
							
						 | 
						
							
							
								
								自动发布试试
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								25311fdb96
								
							
								
							
						 | 
						
							
							
								
								like dateid
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1ecf04c1fb
								
							
								
							
						 | 
						
							
							
								
								先放开不限制必填
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6508faaabf
								
							
								
							
						 | 
						
							
							
								
								like
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								b33758b65d
								
							
								
							
						 | 
						
							
							
								
								新增两列path用于前端回显
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9b6b7ce186
								
							
								
							
						 | 
						
							
							
								
								党建积分列表调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								1f83f07a81
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_workdiary_service'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								284f52a315
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								ad99bac36a
								
							
								
							
						 | 
						
							
							
								
								。。。
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								a55509a500
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/someupdate_zhy'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								f9d622bb55
								
							
								
							
						 | 
						
							
							
								
								【工作日志】服务时间使用easyexcel转化器进行java和excel数据的转换,
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								435d838595
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								aaa4faefbb
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f61830aec1
								
							
								
							
						 | 
						
							
							
								
								到分钟
							
							
							
							
								
							
							
						 | 
						3 years ago |