huangdeliang
							
						 
					 | 
					
						
						
							
						
						a23a02ab60
					 | 
					
						
						
							
							修复总计
						
						
						
						
						
						
					 | 
					
						2020-10-18 10:59:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						72a3837804
					 | 
					
						
						
							
							增加合计功能
						
						
						
						
						
						
					 | 
					
						2020-10-17 17:53:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						93bb576331
					 | 
					
						
						
							
							修复导出提成
						
						
						
						
						
						
					 | 
					
						2020-10-16 10:08:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						a74f2238be
					 | 
					
						
						
							
							修改成交时间
						
						
						
						
						
						
					 | 
					
						2020-10-14 22:21:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						23a4647696
					 | 
					
						
						
							
							首页展示订单
						
						
						
						
						
						
					 | 
					
						2020-10-12 20:28:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						0ed60fb059
					 | 
					
						
						
							
							修改单用户多岗位
						
						
						
						
						
						
					 | 
					
						2020-10-11 00:35:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						d7eafa1d92
					 | 
					
						
						
							
							修改提成计算
						
						
						
						
						
						
					 | 
					
						2020-10-09 22:40:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						72ebb5580c
					 | 
					
						
						
							
							修改提成计算
						
						
						
						
						
						
					 | 
					
						2020-10-09 22:39:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						330f583adb
					 | 
					
						
						
							
							添加策划提成
						
						
						
						
						
						
					 | 
					
						2020-10-09 22:11:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						b594b046cb
					 | 
					
						
						
							
							添加策划提成
						
						
						
						
						
						
					 | 
					
						2020-10-09 22:05:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						d858c965cd
					 | 
					
						
						
							
							过滤禁用的用户
						
						
						
						
						
						
					 | 
					
						2020-10-09 21:47:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						0ce3c1d78e
					 | 
					
						
						
							
							过滤禁用的用户
						
						
						
						
						
						
					 | 
					
						2020-10-09 21:27:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						9883e9c80f
					 | 
					
						
						
							
							修改服务时间为服务时长
						
						
						
						
						
						
					 | 
					
						2020-10-09 09:39:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						2f343601b1
					 | 
					
						
						
							
							修改名称
						
						
						
						
						
						
					 | 
					
						2020-10-08 22:07:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						5522e23de2
					 | 
					
						
						
							
							添加运营助理岗位
						
						
						
						
						
						
					 | 
					
						2020-10-08 21:02:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						c17f078f7b
					 | 
					
						
						
							
							添加订单编号
						
						
						
						
						
						
					 | 
					
						2020-10-08 11:50:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						8f656d7ee0
					 | 
					
						
						
							
							添加默认设置
						
						
						
						
						
						
					 | 
					
						2020-10-08 10:51:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						92fc73e923
					 | 
					
						
						
							
							1,修改用户管理展示岗位信息
						
						
						
						
						
						
						
						2,修复提成比例数据格式为浮点型
3,修复修改提成比例时业务员展示
4,金额数字逢三位加逗号 
						
						
					 | 
					
						2020-10-06 20:16:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						0e3b59b12f
					 | 
					
						
						
							
							修改订单提成过滤未审核数据
						
						
						
						
						
						
					 | 
					
						2020-10-06 18:00:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						3449d12385
					 | 
					
						
						
							
							添加dayjs库
						
						
						
						
						
						
					 | 
					
						2020-10-06 14:37:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						4aee429a2e
					 | 
					
						
						
							
							完成提成界面
						
						
						
						
						
						
					 | 
					
						2020-10-06 14:29:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						d95c1698f5
					 | 
					
						
						
							
							ok
						
						
						
						
						
						
					 | 
					
						2020-10-03 22:35:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						f161f449ba
					 | 
					
						
						
							
							完善订单页面
						
						
						
						
						
						
					 | 
					
						2020-10-03 22:05:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						b1bb07a0da
					 | 
					
						
						
							
							暂存
						
						
						
						
						
						
					 | 
					
						2020-09-28 15:38:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						f6ae2bccf9
					 | 
					
						
						
							
							配置打包
						
						
						
						
						
						
					 | 
					
						2020-09-28 00:55:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						41fb244499
					 | 
					
						
						
							
							完善订单功能
						
						
						
						
						
						
					 | 
					
						2020-09-26 22:28:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						58f276922f
					 | 
					
						
						
							
							暂存
						
						
						
						
						
						
					 | 
					
						2020-09-25 18:58:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						abf4cf2dc2
					 | 
					
						
						
							
							订单管理界面
						
						
						
						
						
						
					 | 
					
						2020-09-24 21:41:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						cf70d53d7f
					 | 
					
						
						
							
							新增提成查询
						
						
						
						
						
						
					 | 
					
						2020-09-24 00:27:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						3deb40bac9
					 | 
					
						
						
							
							修改模板
						
						
						
						
						
						
					 | 
					
						2020-09-23 20:07:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						da4155f00d
					 | 
					
						
						
							
							合并
						
						
						
						
						
						
					 | 
					
						2020-09-22 22:17:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						37df131b13
					 | 
					
						
						
							
							添加订单
						
						
						
						
						
						
					 | 
					
						2020-09-22 22:01:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						d89d17cbb3
					 | 
					
						
						
							
							调整
						
						
						
						
						
						
					 | 
					
						2020-09-22 22:00:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						a82a3d9465
					 | 
					
						
						
							
							升级oshi到最新版本v5.2.5
						
						
						
						
						
						
					 | 
					
						2020-09-22 18:25:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						28bceda630
					 | 
					
						
						
							
							修正文字错误
						
						
						
						
						
						
					 | 
					
						2020-09-22 11:09:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						b96af4bcbe
					 | 
					
						
						
							
							init
						
						
						
						
						
						
					 | 
					
						2020-09-21 15:17:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								huangdeliang
							
						 
					 | 
					
						
						
							
						
						2c0e9fbf99
					 | 
					
						
						
							
							init
						
						
						
						
						
						
					 | 
					
						2020-09-21 15:16:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						69829827fe
					 | 
					
						
						
							
							菜单&数据权限新增(展开/折叠 全选/全不选 父子联动)
						
						
						
						
						
						
					 | 
					
						2020-09-21 14:10:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								若依
							
						 
					 | 
					
						
						
							
						
						89607fb028
					 | 
					
						
						
							
							!100 解决添加用户角色时报错问题
						
						
						
						
						
						
						
						Merge pull request !100 from wensanpi/master 
						
						
					 | 
					
						2020-09-21 10:31:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								wensanpi
							
						 
					 | 
					
						
						
							
						
						1aa18c523d
					 | 
					
						
						
							
							update ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml.
						
						
						
						
						
						
					 | 
					
						2020-09-20 17:38:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						abeb8d7fd8
					 | 
					
						
						
							
							菜单新增是否缓存keep-alive
						
						
						
						
						
						
					 | 
					
						2020-09-20 10:34:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						478fae0d28
					 | 
					
						
						
							
							菜单&数据权限新增(展开/折叠 全选/全不选 父子联动)
						
						
						
						
						
						
					 | 
					
						2020-09-19 13:42:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						0ecf27f8d6
					 | 
					
						
						
							
							去除多余的空格
						
						
						
						
						
						
					 | 
					
						2020-09-18 17:09:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						0a5bb34fbf
					 | 
					
						
						
							
							升级springboot到2.1.17 提升安全性
						
						
						
						
						
						
					 | 
					
						2020-09-18 16:51:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						9e38c7de2e
					 | 
					
						
						
							
							代码生成支持同步数据库
						
						
						
						
						
						
					 | 
					
						2020-09-18 10:24:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						9ca28d6dbf
					 | 
					
						
						
							
							表格操作列间距调整
						
						
						
						
						
						
					 | 
					
						2020-09-18 10:23:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						497f98ba90
					 | 
					
						
						
							
							导入excel整形值校验优化
						
						
						
						
						
						
					 | 
					
						2020-09-17 18:22:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						a948affb2d
					 | 
					
						
						
							
							代码生成支持富文本控件
						
						
						
						
						
						
					 | 
					
						2020-09-15 15:53:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						57b49dd5fa
					 | 
					
						
						
							
							限制系统内置参数不允许删除
						
						
						
						
						
						
					 | 
					
						2020-09-15 15:51:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								RuoYi
							
						 
					 | 
					
						
						
							
						
						9c0ed9c424
					 | 
					
						
						
							
							修复通知公告longblob类型乱码问题
						
						
						
						
						
						
					 | 
					
						2020-09-10 18:23:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |