shuaidawang
							
						 
					 | 
					
						
						
							
						
						bd944c4a8b
					 | 
					
						
						
							
							商品规格和spu前端代码生成
						
						
						
						
						
						
					 | 
					
						2022-05-18 17:12:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shuaidawang
							
						 
					 | 
					
						
						
							
						
						0b087c84c6
					 | 
					
						
						
							
							规格和商品菜单提交
						
						
						
						
						
						
					 | 
					
						2022-05-18 16:53:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						a86cbde090
					 | 
					
						
						
							
							商品spu和sku测试类调整
						
						
						
						
						
						
					 | 
					
						2022-05-18 14:47:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						e314f4aaeb
					 | 
					
						
						
							
							商品规格属性代码生成
						
						
						
						
						
						
					 | 
					
						2022-05-18 14:42:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						2bbfa40265
					 | 
					
						
						
							
							调整商品代码生成模块
						
						
						
						
						
						
					 | 
					
						2022-05-17 22:16:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						657e4d035b
					 | 
					
						
						
							
							spu,sku表结构同步
						
						
						
						
						
						
					 | 
					
						2022-05-17 21:18:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						279127298b
					 | 
					
						
						
							
							spu和sku 自动代码生成
						
						
						
						
						
						
					 | 
					
						2022-05-17 21:12:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								franky
							
						 
					 | 
					
						
						
							
						
						9f9004624b
					 | 
					
						
						
							
							商品规格属性代码生成
						
						
						
						
						
						
					 | 
					
						2022-05-15 22:55:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						0d017e4b1c
					 | 
					
						
						
							
							fix: 删除品牌和分类的无用接口
						
						
						
						
						
						
					 | 
					
						2022-05-12 17:21:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						937180c290
					 | 
					
						
						
							
							fix: 前端必填项显示
						
						
						
						
						
						
					 | 
					
						2022-05-12 17:20:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						d9d473dcf0
					 | 
					
						
						
							
							fix: TODO 分类合理性
						
						
						
						
						
						
					 | 
					
						2022-05-12 17:09:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						ff307a4c86
					 | 
					
						
						
							
							fix: TODO pid 改成 parentId 字段
						
						
						
						
						
						
					 | 
					
						2022-05-12 16:57:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								git
							
						 
					 | 
					
						
						
							
						
						1fc5c3c71c
					 | 
					
						
						
							
							用户个人信息查询
						
						
						
						
						
						
					 | 
					
						2022-05-10 15:21:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						3e01d5d40c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-05-05 19:09:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						c8e00ad04c
					 | 
					
						
						
							
							使用社交账号(微信小程序)登录
						
						
						
						
						
						
					 | 
					
						2022-05-05 19:09:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						e6893db1c3
					 | 
					
						
						
							
							uniapp:code review 商品分类、商品品牌
						
						
						
						
						
						
					 | 
					
						2022-05-05 00:52:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						a233ab1395
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue/views/index.vue.vm 
						
						
					 | 
					
						2022-05-04 23:44:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						4b90792bf1
					 | 
					
						
						
							
							!155 增加手机验证码登录
						
						
						
						
						
						
						
						Merge pull request !155 from 酱包/feature/1.6.2-smsLogin 
						
						
					 | 
					
						2022-05-03 09:12:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						04f9f97162
					 | 
					
						
						
							
							调整社交登录界面,和登录界面保持统一
						
						
						
						
						
						
					 | 
					
						2022-05-03 17:04:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						d0cd440380
					 | 
					
						
						
							
							压缩登录时的图片大小
						
						
						
						
						
						
					 | 
					
						2022-05-03 16:57:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								酱包
							
						 
					 | 
					
						
						
							
						
						4c4e37fd42
					 | 
					
						
						
							
							登录面板增加钉钉、企业微信支付按钮
						
						
						
						
						
						
					 | 
					
						2022-05-03 14:31:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						4b09dfe855
					 | 
					
						
						
							
							!154 修复代码生成UpdateReqVO时import多一个括号问题
						
						
						
						
						
						
						
						Merge pull request !154 from 岁月无声/feat_chow5945 
						
						
					 | 
					
						2022-05-03 04:43:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								zhoulei@xsyxsc.com
							
						 
					 | 
					
						
						
							
						
						da2426c80d
					 | 
					
						
						
							
							修复代码生成VO多一个括号问题
						
						
						
						
						
						
						
						(cherry picked from commit 974cef3a534ae575422c75ab5a04b272d18a6b14) 
						
						
					 | 
					
						2022-05-03 12:30:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9848a95eb0
					 | 
					
						
						
							
							【升级】mysql-connector-java from 5.1.46 to 8.0.28 :提升 MySQL 客户端的性能
						
						
						
						
						
						
					 | 
					
						2022-05-02 23:36:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						3c2de45067
					 | 
					
						
						
							
							update yudao-server/src/main/resources/application-local.yaml.
						
						
						
						
						
						
						
						修改默认使用 MySQL 连接的示例 
						
						
					 | 
					
						2022-05-02 15:06:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						7753bd4c44
					 | 
					
						
						
							
							1. code review 后台的短信验证码登陆
						
						
						
						
						
						
						
						2. 解决 SQL Server LIMIT 1 存在报错的问题 
						
						
					 | 
					
						2022-05-02 22:57:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4453ac27ff
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-smsLogin
						
						
						
						
						
						
						
						 Conflicts:
	sql/ruoyi-vue-pro.sql
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/security/config/SecurityConfiguration.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
	yudao-ui-admin/src/api/login.js
	yudao-ui-admin/src/store/modules/user.js 
						
						
					 | 
					
						2022-05-02 21:36:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						c533f5e5e8
					 | 
					
						
						
							
							优化精简vuex存储
						
						
						
						
						
						
					 | 
					
						2022-05-02 19:37:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ccdf0e4151
					 | 
					
						
						
							
							增加多数据库的适配说明
						
						
						
						
						
						
					 | 
					
						2022-05-02 18:17:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						4c2e8c92d1
					 | 
					
						
						
							
							增加多数据库的适配说明
						
						
						
						
						
						
					 | 
					
						2022-05-02 18:11:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						272e7dd206
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
						
						
						
						
						
						
					 | 
					
						2022-05-02 18:07:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						e750e15b96
					 | 
					
						
						
							
							!153 增加 SQLServer 的适配~
						
						
						
						
						
						
						
						Merge pull request !153 from 芋道源码/feature/1.6.2 
						
						
					 | 
					
						2022-05-02 10:05:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						60f918da84
					 | 
					
						
						
							
							增加 SQLServer 的适配~
						
						
						
						
						
						
					 | 
					
						2022-05-02 18:04:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						73f53861b2
					 | 
					
						
						
							
							vuex统一命名风格:补充提交
						
						
						
						
						
						
					 | 
					
						2022-05-02 17:58:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						a3defee272
					 | 
					
						
						
							
							可变参数/app-api应配置到baseUrl
						
						
						
						
						
						
					 | 
					
						2022-05-02 17:46:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						5efd621f21
					 | 
					
						
						
							
							vuex统一命名风格
						
						
						
						
						
						
					 | 
					
						2022-05-02 16:53:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						1f5e168e79
					 | 
					
						
						
							
							默认注释 Redis 的账号密码
						
						
						
						
						
						
					 | 
					
						2022-05-02 16:03:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						fd0c07c1f8
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql
						
						
						
						
						
						
					 | 
					
						2022-05-02 16:01:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						6f312f9466
					 | 
					
						
						
							
							!147 增加redis密码
						
						
						
						
						
						
						
						Merge pull request !147 from Hermit/fork 
						
						
					 | 
					
						2022-05-02 08:01:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						cf3cfdd2d6
					 | 
					
						
						
							
							补全用户与岗位的关联的单元测试,简化相关的实现代码
						
						
						
						
						
						
					 | 
					
						2022-05-02 15:59:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c845f3f012
					 | 
					
						
						
							
							Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.6.2-postgresql
						
						
						
						
						
						
					 | 
					
						2022-05-02 15:24:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						7d87be8b7d
					 | 
					
						
						
							
							!113 新建一个关联表,维护用户和岗位的关系
						
						
						
						
						
						
						
						Merge pull request !113 from anzhen-tech/master 
						
						
					 | 
					
						2022-05-02 07:20:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						1ebfb20d08
					 | 
					
						
						
							
							!135 【修复】代码生成对话框的日期选择器,在编辑情况下不能回显
						
						
						
						
						
						
						
						Merge pull request !135 from dearliuliu0522/dev 
						
						
					 | 
					
						2022-05-02 04:35:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						8606f5c605
					 | 
					
						
						
							
							优化 UserSession 的实现,将 id 变成自增,额外增加 token 字段
						
						
						
						
						
						
					 | 
					
						2022-05-02 12:33:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						501aea226a
					 | 
					
						
						
							
							Merge pull request #137 from KLSOBIG/修复代码生成器biz路径问题
						
						
						
						
						
						
						
						修复代码生成器biz路径问题 
						
						
					 | 
					
						2022-05-02 11:57:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						1a3e0b08c4
					 | 
					
						
						
							
							!108 update yudao-ui-admin/src/views/bpm/model/modelEditor.vue.
						
						
						
						
						
						
						
						Merge pull request !108 from 四叶草/N/A 
						
						
					 | 
					
						2022-05-02 03:55:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anzhen
							
						 
					 | 
					
						
						
							
						
						18a3f4d3eb
					 | 
					
						
						
							
							Merge branch 'upstream/master'
						
						
						
						
						
						
						
						# Conflicts:
#	sql/ruoyi-vue-pro.sql 
						
						
					 | 
					
						2022-05-02 11:50:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						256405761b
					 | 
					
						
						
							
							!152 对 Oracle 数据库的支持
						
						
						
						
						
						
						
						Merge pull request !152 from 芋道源码/feature/1.6.2 
						
						
					 | 
					
						2022-05-01 15:20:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						0f21b55e6d
					 | 
					
						
						
							
							解决 Oracle 关键字冲突的问题
						
						
						
						
						
						
						
						导出最新的 SQL 脚本 
						
						
					 | 
					
						2022-05-01 23:18:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						a54298bf25
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-05-01 22:42:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |