mk
							
						 | 
						
							
							
							
								
							
								3cb7c23b67
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-烟台0301' into yantai_dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								6e61d05374
								
							
								
							
						 | 
						
							
							
								
								更改地址,字典接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								92d9d288fb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-烟台0301' into yantai_dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								9b78cfb661
								
							
								
							
						 | 
						
							
							
								
								标签配置/党建宣传下拉框加必填且不允许输入
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								e3c2871d57
								
							
								
							
						 | 
						
							
							
								
								徽章审核/群租房列表调整
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								7a0db25bf1
								
							
								
							
						 | 
						
							
							
								
								徽章管理
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								ec0ce11f36
								
							
								
							
						 | 
						
							
							
								
								先提交下
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								dbd8ba2f7d
								
							
								
							
						 | 
						
							
							
								
								徽章管理先提交下
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								24d7094df6
								
							
								
							
						 | 
						
							
							
								
								群租房样式优化
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								d7a21e1c72
								
							
								
							
						 | 
						
							
							
								
								群租房
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								e42dbd8628
								
							
								
							
						 | 
						
							
							
								
								群租房先提交下
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								126d36911a
								
							
								
							
						 | 
						
							
							
								
								标签管理做了列表页
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								1e10c9d9b5
								
							
								
							
						 | 
						
							
							
								
								0301需求:系统管理-操作记录调整参数
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								737565b105
								
							
								
							
						 | 
						
							
							
								
								兼容返回null的问题
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								bc7d62d3c7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-烟台0220需求' into yantai_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								054f479ff6
								
							
								
							
						 | 
						
							
							
								
								群众满意度
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								b90f135fb9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-烟台0220需求' into yantai_master
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	src/views/modules/base/organization/organization.vue 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								0df854d7c9
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								3184335149
								
							
								
							
						 | 
						
							
							
								
								通讯录搜索
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								d6f443ba43
								
							
								
							
						 | 
						
							
							
								
								联建活动
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								9212d4f531
								
							
								
							
						 | 
						
							
							
								
								根据尹作梅女士的意见修改
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								3c1b0b90ad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-烟台0220需求' into yantai_dev
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	package.json
#	src/views/pages/login.vue 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								107fae45f9
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								4828ae7213
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into dev-烟台0220需求
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	src/views/modules/base/communityYantai/community.vue 
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								d8ff6276a8
								
							
								
							
						 | 
						
							
							
								
								福利人员管理
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								025c93ebcb
								
							
								
							
						 | 
						
							
							
								
								福利人员
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								5b4595b6f9
								
							
								
							
						 | 
						
							
							
								
								烟台首页修复社区服务链接地址不对的问题
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								 
								dai
							
						 | 
						
							
							
							
								
							
								67e5095a20
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into yantai_master
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								2381335a0e
								
							
								
							
						 | 
						
							
							
								
								多了个1
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								2333534a32
								
							
								
							
						 | 
						
							
							
								
								图片回填问题/防疫统计列表问题
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								5a6e6d4c37
								
							
								
							
						 | 
						
							
							
								
								点击图表弹出相应的列表
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								886ec9a3f9
								
							
								
							
						 | 
						
							
							
								
								话题管理详情语音
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								204dc060f7
								
							
								
							
						 | 
						
							
							
								
								提示信息
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								88f292e65c
								
							
								
							
						 | 
						
							
							
								
								话题管理详情
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								5f25aeed87
								
							
								
							
						 | 
						
							
							
								
								统计分析列表,查看/修改话题发表人字段
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								3c4fb6dbf5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								88cf4d8910
								
							
								
							
						 | 
						
							
							
								
								查看党员bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								cea9bdce1d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								cfd5d09ade
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								dd383b25c3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								5d410fd4ba
								
							
								
							
						 | 
						
							
							
								
								组织简介
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								2582dc9a06
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								c82d8d2bce
								
							
								
							
						 | 
						
							
							
								
								接口
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								39710af662
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								0be8d67705
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								116172d7a9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								72a36a5224
								
							
								
							
						 | 
						
							
							
								
								更改下文件名
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								19136ac5c8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								e4d859d81a
								
							
								
							
						 | 
						
							
							
								
								联调
							
							
							
							
								
							
							
						 | 
						3 years ago | 
					
				
					
						
							
							
								
								 mk
							
						 | 
						
							
							
							
								
							
								b7e0b11cd2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev-用户反馈' into dev
							
							
							
							
								
							
							
						 | 
						3 years ago |