yinzuomei
							
						 | 
						
							
							
							
								
							
								1556f334df
								
							
								
							
						 | 
						
							
							
								
								bugfix
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								c2f45bc4b6
								
							
								
							
						 | 
						
							
							
								
								wxController迁移
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								39e1f6c09b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_guidance' into dev_guidance
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								0fe294e7dc
								
							
								
							
						 | 
						
							
							
								
								qihuo
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								4777b56d32
								
							
								
							
						 | 
						
							
							
								
								wxController
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								6e79562bff
								
							
								
							
						 | 
						
							
							
								
								办事指南附件上传
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								b0eb2dc7ad
								
							
								
							
						 | 
						
							
							
								
								客户下组织树
							
							
							
							
							
							
								
							
							
							工作人员所在组织 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								005487aeba
								
							
								
							
						 | 
						
							
							
								
								分类
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								18c04e0ced
								
							
								
							
						 | 
						
							
							
								
								getcategory调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7ba4e771a8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_guidance' into dev_guidance
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								e59701c4de
								
							
								
							
						 | 
						
							
							
								
								web分类列表查询不分页,分类下拉框通用接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								de42e5226a
								
							
								
							
						 | 
						
							
							
								
								paixushijian
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								d919a1c09a
								
							
								
							
						 | 
						
							
							
								
								我的小组添加筛选条件
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								76cc97293f
								
							
								
							
						 | 
						
							
							
								
								接口加返参、人员列表顺序调整
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								9a66324acf
								
							
								
							
						 | 
						
							
							
								
								【新增】1.完成小组总排名接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								5716a47e0a
								
							
								
							
						 | 
						
							
							
								
								办事指南增删改查
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7ff134f3a4
								
							
								
							
						 | 
						
							
							
								
								guide_category_default相关生成的代码,删除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								wxz
							
						 | 
						
							
							
							
								
							
								41f73d4253
								
							
								
							
						 | 
						
							
							
								
								【新增】1.完成网格内小组排名接口
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								989f6194e4
								
							
								
							
						 | 
						
							
							
								
								默认值
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								b5fcc12655
								
							
								
							
						 | 
						
							
							
								
								排序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								bc1c0b292e
								
							
								
							
						 | 
						
							
							
								
								排序修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								7ab738da40
								
							
								
							
						 | 
						
							
							
								
								漏提代码
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								50985c9532
								
							
								
							
						 | 
						
							
							
								
								程序调整优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								f5d1c068e0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev_statistical_optimize' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								ccfbbbe015
								
							
								
							
						 | 
						
							
							
								
								全部党员
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								cbde6493a7
								
							
								
							
						 | 
						
							
							
								
								全部党员
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zhaoqifeng
							
						 | 
						
							
							
							
								
							
								f86ea8eae0
								
							
								
							
						 | 
						
							
							
								
								办事指南
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								05f3762f41
								
							
								
							
						 | 
						
							
							
								
								8、活动/通知/话题评论允许有图片
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								da4abdd281
								
							
								
							
						 | 
						
							
							
								
								查询客户下党员
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								29256d2d77
								
							
								
							
						 | 
						
							
							
								
								群组介绍
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								55916816f7
								
							
								
							
						 | 
						
							
							
								
								组织生活
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								1298b0acd7
								
							
								
							
						 | 
						
							
							
								
								去除多余的error信息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								4e4ddadd94
								
							
								
							
						 | 
						
							
							
								
								五种入组方式均需要推送站内信、微信消息
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								2ec305e6fe
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								906dd81205
								
							
								
							
						 | 
						
							
							
								
								添加新字段
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								30c306ba71
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a61fd17deb
								
							
								
							
						 | 
						
							
							
								
								组织下不允许看到非组织添加的人员、部门网格下添加的人不允许再部门网格下移除
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								f21f8f2a5e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_staff_info' into dev
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								a2c2f99b2a
								
							
								
							
						 | 
						
							
							
								
								评价指标模块 设置分值的按照【总分=各个能力值四舍五入保留一位 * 权重 相加,结果值四舍五入保留一位;
							
							
							
							
							
							
								
							
							
							三大能力的分=原始值四舍五入保留一位* 权重,结果值四舍五入保留一位;
               单项原始值:直接四舍五入保留一位小数;】调整
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								e7571f0538
								
							
								
							
						 | 
						
							
							
								
								四舍五入
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								084be558ed
								
							
								
							
						 | 
						
							
							
								
								month/indexscore接口修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								3dfb39724f
								
							
								
							
						 | 
						
							
							
								
								/report/fact/index/scorelist接口修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								24c02ab557
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								yinzuomei
							
						 | 
						
							
							
							
								
							
								7d2ccc1906
								
							
								
							
						 | 
						
							
							
								
								selectMonthPieChart修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								zxc
							
						 | 
						
							
							
							
								
							
								8d08abc80c
								
							
								
							
						 | 
						
							
							
								
								screenProjectOrgDaily修改
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								23936ab743
								
							
								
							
						 | 
						
							
							
								
								组织内有单位领导标签的人排在前面,网格内有网格长标签的人排在前面,部门内有部门领导标签的人排在前面,相同职位及其他职位按创建顺序排序
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								a574ef5683
								
							
								
							
						 | 
						
							
							
								
								差值 差值 代码微调
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								7e1a228191
								
							
								
							
						 | 
						
							
							
								
								差值 差值
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								sunyuchao
							
						 | 
						
							
							
							
								
							
								b1c45ef558
								
							
								
							
						 | 
						
							
							
								
								sql优化
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jianjun
							
						 | 
						
							
							
							
								
							
								6e41c8f4a9
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java 
							
						 | 
						4 years ago |