paidaxing444
							
						 
					 | 
					
						
						
							
						
						5121947a71
					 | 
					
						
						
							
							见习之星考核过程
						
						
						
						
						
						
					 | 
					
						2020-08-29 18:23:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paidaxing444
							
						 
					 | 
					
						
						
							
						
						7fc9e72a9c
					 | 
					
						
						
							
							见习之星考核过程
						
						
						
						
						
						
					 | 
					
						2020-08-29 16:13:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sk1551
							
						 
					 | 
					
						
						
							
						
						940d11a8f3
					 | 
					
						
						
							
							优化基地区级审核
						
						
						
						
						
						
					 | 
					
						2020-08-29 15:48:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paidaxing444
							
						 
					 | 
					
						
						
							
						
						81ac18fd95
					 | 
					
						
						
							
							见习之星考核过程
						
						
						
						
						
						
					 | 
					
						2020-08-29 11:42:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paidaxing444
							
						 
					 | 
					
						
						
							
						
						14e206c9ad
					 | 
					
						
						
							
							笔试、面试
						
						
						
						
						
						
					 | 
					
						2020-08-24 09:50:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mumu
							
						 
					 | 
					
						
						
							
						
						184b0fe675
					 | 
					
						
						
							
							笔试名单导入导出功能完成
						
						
						
						
						
						
					 | 
					
						2020-08-23 23:56:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mumu
							
						 
					 | 
					
						
						
							
						
						477f6e71bd
					 | 
					
						
						
							
							Tsbzjdcx.java更新
						
						
						
						
						
						
					 | 
					
						2020-08-23 18:54:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mumu
							
						 
					 | 
					
						
						
							
						
						7496d01a95
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into master
						
						
						
						
						
						
						
						# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java 
						
						
					 | 
					
						2020-08-23 18:51:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mumu
							
						 
					 | 
					
						
						
							
						
						f552043554
					 | 
					
						
						
							
							笔试名单导出更新
						
						
						
						
						
						
					 | 
					
						2020-08-23 18:46:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paidaxing444
							
						 
					 | 
					
						
						
							
						
						5b00aad739
					 | 
					
						
						
							
							面试
						
						
						
						
						
						
					 | 
					
						2020-08-23 17:11:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sk1551
							
						 
					 | 
					
						
						
							
						
						0de66b1055
					 | 
					
						
						
							
							新增基地区级审核
						
						
						
						
						
						
					 | 
					
						2020-08-21 08:42:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paidaxing444
							
						 
					 | 
					
						
						
							
						
						b7a621336d
					 | 
					
						
						
							
							见习教师目录
						
						
						
						
						
						
					 | 
					
						2020-08-20 18:00:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sk1551
							
						 
					 | 
					
						
						
							
						
						2e8f2ae9fa
					 | 
					
						
						
							
							优化见习教师评选
						
						
						
						
						
						
					 | 
					
						2020-08-20 17:29:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paidaxing444
							
						 
					 | 
					
						
						
							
						
						6256be501a
					 | 
					
						
						
							
							见习教师目录
						
						
						
						
						
						
					 | 
					
						2020-08-20 16:33:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sk1551
							
						 
					 | 
					
						
						
							
						
						8d47804fe6
					 | 
					
						
						
							
							新增见习教师基本信息
						
						
						
						
						
						
					 | 
					
						2020-08-20 14:51:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								paidaxing444
							
						 
					 | 
					
						
						
							
						
						4f0c00ddd0
					 | 
					
						
						
							
							见习教师目录
						
						
						
						
						
						
					 | 
					
						2020-08-20 10:55:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						8f9f0c04cc
					 | 
					
						
						
							
							若依 3.1
						
						
						
						
						
						
					 | 
					
						2020-08-13 10:27:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						51fa66f61a
					 | 
					
						
						
							
							唯一限制条件只返回单条数据
						
						
						
						
						
						
					 | 
					
						2020-08-05 14:28:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								liguonan
							
						 
					 | 
					
						
						
							
						
						de2ac66f0b
					 | 
					
						
						
							
							修复在线用户判断逻辑
						
						
						
						
						
						
					 | 
					
						2020-08-03 17:57:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						b32d0724b7
					 | 
					
						
						
							
							升级vue-cli版本到4.4.4
						
						
						
						
						
						
					 | 
					
						2020-07-31 22:35:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yongdaidai
							
						 
					 | 
					
						
						
							
						
						fb19dd3e4e
					 | 
					
						
						
							
							update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml.
						
						
						
						
						
						
						
						解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题. 
						
						
					 | 
					
						2020-07-31 14:59:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sxile
							
						 
					 | 
					
						
						
							
						
						be778ba370
					 | 
					
						
						
							
							修复参数注释
						
						
						
						
						
						
					 | 
					
						2020-07-23 14:54:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						cee572f237
					 | 
					
						
						
							
							若依 3.0
						
						
						
						
						
						
					 | 
					
						2020-07-19 10:25:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |