yinzuomei
							
						 | 
						
							
							
							
								
							
								e499e8a9ab
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								2439adcfd5
								
							
								
							
						 | 
						
							
							
								
								test
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								1f1cb6637e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								859e283bf8
								
							
								
							
						 | 
						
							
							
								
								实时抽取项目数据部分 添加 objectid有针对性的处理数据 extractProjectPeriodData,extractProjectCategory部分修改完毕
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								630d19c101
								
							
								
							
						 | 
						
							
							
								
								服务完成pc和小程序通用
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								ff1f7ea0f6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								34b48a1cc4
								
							
								
							
						 | 
						
							
							
								
								我的需求被指派。应该通知我。
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								876c967e07
								
							
								
							
						 | 
						
							
							
								
								项目实时抽取 添加参数projectId
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								862970e811
								
							
								
							
						 | 
						
							
							
								
								表决中议题详情——支持、反对数修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								549d92abb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								51571a2f0f
								
							
								
							
						 | 
						
							
							
								
								>0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								62abdb2b0a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1fa6beb13a
								
							
								
							
						 | 
						
							
							
								
								autoEvaluateDemandTask
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f2a85da553
								
							
								
							
						 | 
						
							
							
								
								实时抽取项目数据部分 添加 objectid有针对性的处理数据 saveOriginProjectDaily部分修改完毕
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b2a7d0a942
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								8db7b700fb
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								6d16cc034d
								
							
								
							
						 | 
						
							
							
								
								事件详情语音附件加返参
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								852e55ffa1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1bfe58b871
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								55551c785a
								
							
								
							
						 | 
						
							
							
								
								bizTyp=community_service
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d11efb5858
								
							
								
							
						 | 
						
							
							
								
								实时抽取项目数据部分 添加 objectid有针对性的处理数据
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								356381a25c
								
							
								
							
						 | 
						
							
							
								
								活动相关脚本
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								1f11cab05a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								9902bc30ba
								
							
								
							
						 | 
						
							
							
								
								.
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2e1cc70170
								
							
								
							
						 | 
						
							
							
								
								project升级
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								4f5fcdc36f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								0923740adc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								65ba30517c
								
							
								
							
						 | 
						
							
							
								
								job和heart
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								1d5c8c40c1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								7a2d7de33d
								
							
								
							
						 | 
						
							
							
								
								project
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								abbc38b68e
								
							
								
							
						 | 
						
							
							
								
								project升级
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								eb1b232d1b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								af14a93110
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								41db667a68
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								01fbb451d9
								
							
								
							
						 | 
						
							
							
								
								project
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								70d921f2f8
								
							
								
							
						 | 
						
							
							
								
								job和heart
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								86ed4a89a3
								
							
								
							
						 | 
						
							
							
								
								project升级
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b8d0394e97
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								58aa8098e6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								4da5fead8f
								
							
								
							
						 | 
						
							
							
								
								判断客户下是不是存在一级分类
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2d06389c0a
								
							
								
							
						 | 
						
							
							
								
								暂时解决内存溢出问题 后续重写优化 up
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								d57a47f317
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								883eda023a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								b86dffd87a
								
							
								
							
						 | 
						
							
							
								
								暂时解决内存溢出问题 后续重写优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								2b5358886d
								
							
								
							
						 | 
						
							
							
								
								代码扫描出的 高级问题
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								ddf2ac2ff8
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								8d2d25be2e
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								5ed3c9d7ce
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								c09580cb93
								
							
								
							
						 | 
						
							
							
								
								'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								83f290446c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ic_mp' into develop
							
							
							
							
								
							
							
						 | 
						4 years ago |