wanggongfeng
							
						 | 
						
							
							
							
								
							
								3aeb896dbe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/dev/vaccine_prarmeter'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wanggongfeng
							
						 | 
						
							
							
							
								
							
								6bde4c221e
								
							
								
							
						 | 
						
							
							
								
								新冠病毒疫苗接种人员信息台账
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								9e6e7f68b6
								
							
								
							
						 | 
						
							
							
								
								排了个序
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								9611fd719c
								
							
								
							
						 | 
						
							
							
								
								【证件类型】护照-居民新增、导入、修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								696c68f5db
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'feature/visitor2_zhy'
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								f5c511735e
								
							
								
							
						 | 
						
							
							
								
								支部信息及未读消息数
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								b4810eb48f
								
							
								
							
						 | 
						
							
							
								
								日期
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								dcc98abf13
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								8f74aab460
								
							
								
							
						 | 
						
							
							
								
								拼错了
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								f31aa9ffdc
								
							
								
							
						 | 
						
							
							
								
								年度计划查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6f9c4312e2
								
							
								
							
						 | 
						
							
							
								
								工作端小程序活动列表接口兼容
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								d4c17337eb
								
							
								
							
						 | 
						
							
							
								
								daochu
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3ef027ba0d
								
							
								
							
						 | 
						
							
							
								
								生成年度计划,批量新增
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								822744f373
								
							
								
							
						 | 
						
							
							
								
								默认发布党组织
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								8db73367ca
								
							
								
							
						 | 
						
							
							
								
								更改生成模板
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0c182e4408
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								52d165f3b6
								
							
								
							
						 | 
						
							
							
								
								活动类型名称关联customerId
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8af318c3fa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								55fc092534
								
							
								
							
						 | 
						
							
							
								
								年度计划微调
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								161ca51455
								
							
								
							
						 | 
						
							
							
								
								消息改为已读
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								e5a08afb8c
								
							
								
							
						 | 
						
							
							
								
								【证件类型】护照-完成正则工具类,并且修改居民导入逻辑为正则工具类
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								0d62ced0f5
								
							
								
							
						 | 
						
							
							
								
								合并折线图功能
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c02382f0a4
								
							
								
							
						 | 
						
							
							
								
								删除、发布活动
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4455a67f53
								
							
								
							
						 | 
						
							
							
								
								详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								wangxianzhang
							
						 | 
						
							
							
							
								
							
								9242d2fef6
								
							
								
							
						 | 
						
							
							
								
								【证件类型】护照-导入完成修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								9e64429aea
								
							
								
							
						 | 
						
							
							
								
								已经发布的编辑需要发送消息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								940ebd4f6a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								083ca8fe85
								
							
								
							
						 | 
						
							
							
								
								xiangqing
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								9043c65be1
								
							
								
							
						 | 
						
							
							
								
								展示列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								61499f71f9
								
							
								
							
						 | 
						
							
							
								
								消息列表接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2b1cfe0e7e
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a4de7bbb92
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								a16951251d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								d62edc9d05
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								6ae617f222
								
							
								
							
						 | 
						
							
							
								
								又tm丢了
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								fc94ca79b5
								
							
								
							
						 | 
						
							
							
								
								消息推送接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c14f970cb1
								
							
								
							
						 | 
						
							
							
								
								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/service/impl/IcPartyActServiceImpl.java 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								cc09e3c628
								
							
								
							
						 | 
						
							
							
								
								分页查询
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								cf53b34dcf
								
							
								
							
						 | 
						
							
							
								
								先提一版
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								c1f84de710
								
							
								
							
						 | 
						
							
							
								
								先提一版
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ecc0d6f0b3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f5ea78db4f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								a6a83166f1
								
							
								
							
						 | 
						
							
							
								
								发送消息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								022ab84ed1
								
							
								
							
						 | 
						
							
							
								
								tiyixia
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cc34cb2ead
								
							
								
							
						 | 
						
							
							
								
								发送消息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								d73c258690
								
							
								
							
						 | 
						
							
							
								
								补充客户id
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b4ca75470b
								
							
								
							
						 | 
						
							
							
								
								暂提列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								zhangyuan
							
						 | 
						
							
							
							
								
							
								426d3d0032
								
							
								
							
						 | 
						
							
							
								
								直接返回小区
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								syc
							
						 | 
						
							
							
							
								
							
								eb6bb1d67a
								
							
								
							
						 | 
						
							
							
								
								先提一版
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								e76b39c9be
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into pingyin_master
							
							
							
							
								
							
							
						 | 
						3 years ago |