sfmind
							
						 
					 | 
					
						
						
							
						
						a3defee272
					 | 
					
						
						
							
							可变参数/app-api应配置到baseUrl
						
						
						
						
						
						
					 | 
					
						2022-05-02 17:46:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						5efd621f21
					 | 
					
						
						
							
							vuex统一命名风格
						
						
						
						
						
						
					 | 
					
						2022-05-02 16:53:56 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						aa22ef8339
					 | 
					
						
						
							
							会员地址管理CRUD
						
						
						
						
						
						
					 | 
					
						2022-05-01 22:39:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						f7d384e55d
					 | 
					
						
						
							
							api按模块单独配置文件
						
						
						
						
						
						
					 | 
					
						2022-05-01 22:39:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						083daa657d
					 | 
					
						
						
							
							用户登录token过期处理
						
						
						
						
						
						
					 | 
					
						2022-05-01 22:38:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						83bc6fac65
					 | 
					
						
						
							
							引入级联选择插件w-picker
						
						
						
						
						
						
					 | 
					
						2022-05-01 17:51:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shuaidawang
							
						 
					 | 
					
						
						
							
						
						14a1d70cbb
					 | 
					
						
						
							
							【促销活动】-代码生成
						
						
						
						
						
						
					 | 
					
						2022-04-28 16:18:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						8d08d5939f
					 | 
					
						
						
							
							品牌 crud
						
						
						
						
						
						
					 | 
					
						2022-04-25 16:32:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						cc6c3d2759
					 | 
					
						
						
							
							品牌代码生成
						
						
						
						
						
						
					 | 
					
						2022-04-25 16:11:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						6102c1ce47
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/fix/master' into feature/1.8.0-uniapp
						
						
						
						
						
						
					 | 
					
						2022-04-25 15:12:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						110dcdd5a0
					 | 
					
						
						
							
							- 文件上传接口合并
						
						
						
						
						
						
						
						- ImageUpload 组件回调 url 处理 
						
						
					 | 
					
						2022-04-25 12:27:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						f7958dcf40
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/fix/master' into feature/1.8.0-uniapp
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-ui-admin/src/components/ImageUpload/index.vue 
						
						
					 | 
					
						2022-04-25 11:41:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						8391898b26
					 | 
					
						
						
							
							fix(前端 ImageUpload 组件):
						
						
						
						
						
						
						
						- 前端 ImageUpload 组件, 上传路径以及地址拼接
- 基础设施-文件上传, 新增简单上传接口 
						
						
					 | 
					
						2022-04-24 22:43:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						76d310610b
					 | 
					
						
						
							
							fix(代码生成):
						
						
						
						
						
						
						
						导出 Excel 文件的文件名, 代码生成解析异常. 
						
						
					 | 
					
						2022-04-24 22:32:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						f01b82f07a
					 | 
					
						
						
							
							商品分类可上传图片
						
						
						
						
						
						
					 | 
					
						2022-04-24 22:22:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						c8f3eb6fdf
					 | 
					
						
						
							
							【修复】图片上传组件
						
						
						
						
						
						
					 | 
					
						2022-04-24 22:06:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jeromesoar
							
						 
					 | 
					
						
						
							
						
						760344727d
					 | 
					
						
						
							
							【修复】包异常
						
						
						
						
						
						
					 | 
					
						2022-04-24 20:29:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						924a23003f
					 | 
					
						
						
							
							!136 商品模块
						
						
						
						
						
						
						
						Merge pull request !136 from Jerome/feature/1.8.0-uniapp 
						
						
					 | 
					
						2022-04-24 12:20:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						145238ea96
					 | 
					
						
						
							
							文件上传
						
						
						
						
						
						
					 | 
					
						2022-04-24 18:05:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						df23750203
					 | 
					
						
						
							
							文件上传
						
						
						
						
						
						
					 | 
					
						2022-04-24 18:02:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						e3589eae11
					 | 
					
						
						
							
							简单上传文件
						
						
						
						
						
						
					 | 
					
						2022-04-24 17:55:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						e4ca2e25f9
					 | 
					
						
						
							
							树化
						
						
						
						
						
						
					 | 
					
						2022-04-24 17:37:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						d3edaec2b1
					 | 
					
						
						
							
							商品分类维护
						
						
						
						
						
						
					 | 
					
						2022-04-24 17:01:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						4e67b6bbcf
					 | 
					
						
						
							
							商品分类代码生成
						
						
						
						
						
						
					 | 
					
						2022-04-24 14:42:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JeromeSoar
							
						 
					 | 
					
						
						
							
						
						09722c0cd6
					 | 
					
						
						
							
							【修复】mall 父模块 artifactId
						
						
						
						
						
						
					 | 
					
						2022-04-24 10:12:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shuaidawang
							
						 
					 | 
					
						
						
							
						
						c4f9f489fa
					 | 
					
						
						
							
							【营销模块】新建模块重命名
						
						
						
						
						
						
					 | 
					
						2022-04-23 23:32:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								shuaidawang
							
						 
					 | 
					
						
						
							
						
						ece6712d69
					 | 
					
						
						
							
							【营销模块】新建模块yudao-module-market
						
						
						
						
						
						
					 | 
					
						2022-04-23 23:22:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						6e40469735
					 | 
					
						
						
							
							【修复】菜单无法使用外链的问题
						
						
						
						
						
						
					 | 
					
						2022-04-23 01:30:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						bbb5bed7da
					 | 
					
						
						
							
							1. 新增《接口文档》《菜单路由》等
						
						
						
						
						
						
					 | 
					
						2022-04-22 22:47:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						3a0feef402
					 | 
					
						
						
							
							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-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.http
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/package-info.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressCreateReqVO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressRespVO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/package-info.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/enums/AddressTypeEnum.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java 
						
						
					 | 
					
						2022-04-22 20:18:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						033b37eec5
					 | 
					
						
						
							
							!134 修复敏感词表格的”创建时间“列内容错误,以及在”标签“列的标签之间增加空格
						
						
						
						
						
						
						
						Merge pull request !134 from dearliuliu0522/dev 
						
						
					 | 
					
						2022-04-22 11:04:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dearliuliu0522
							
						 
					 | 
					
						
						
							
						
						c348fc2a19
					 | 
					
						
						
							
							【优化】编辑字典类型时设置字典类型元素为不可编辑状态
						
						
						
						
						
						
					 | 
					
						2022-04-22 16:34:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dearliuliu0522
							
						 
					 | 
					
						
						
							
						
						4f6984b021
					 | 
					
						
						
							
							取消编辑字典类型时设置字典类型元素为不可编辑状态
						
						
						
						
						
						
					 | 
					
						2022-04-22 16:28:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dearliuliu0522
							
						 
					 | 
					
						
						
							
						
						80629da1bd
					 | 
					
						
						
							
							【优化】编辑字典类型表单时,字典类型设置为不可编辑
						
						
						
						
						
						
					 | 
					
						2022-04-22 16:13:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dearliuliu0522
							
						 
					 | 
					
						
						
							
						
						08cb9955c7
					 | 
					
						
						
							
							修复敏感词表格创建时间列内容错误,标签列标签之间增加空格
						
						
						
						
						
						
					 | 
					
						2022-04-22 15:10:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						9ee501d845
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-04-22 00:08:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						09103f310b
					 | 
					
						
						
							
							1. 【修复】单元测试报错
						
						
						
						
						
						
						
						2. 【优化】yudao-module-xx-impl 调整成 yudao-module-xx-biz,更加符合定位 
						
						
					 | 
					
						2022-04-22 00:07:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						6d36c7a6f7
					 | 
					
						
						
							
							!133 【新增】菜单新增是否缓存、是否隐藏的字段
						
						
						
						
						
						
						
						Merge pull request !133 from 芋道源码/feature/1.6.2 
						
						
					 | 
					
						2022-04-20 17:48:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						c703628940
					 | 
					
						
						
							
							【新增】菜单新增是否缓存、是否隐藏的字段
						
						
						
						
						
						
					 | 
					
						2022-04-21 01:47:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						79ab6f308d
					 | 
					
						
						
							
							用户修改昵称
						
						
						
						
						
						
					 | 
					
						2022-04-21 01:47:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						e9c0c452c8
					 | 
					
						
						
							
							请求响应错误统一处理
						
						
						
						
						
						
					 | 
					
						2022-04-21 01:46:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						713817d0f1
					 | 
					
						
						
							
							退出登录、修改个人头像
						
						
						
						
						
						
					 | 
					
						2022-04-21 00:01:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						5e19beee53
					 | 
					
						
						
							
							产品页底部留出兼容iPhone手机的安全区域
						
						
						
						
						
						
					 | 
					
						2022-04-20 23:59:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						0d08ed26a5
					 | 
					
						
						
							
							由于uni-app的上传图片uni.uploadFile目前仅支持POST方法,所以将PUT改为POST
						
						
						
						
						
						
					 | 
					
						2022-04-20 23:55:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								芋道源码
							
						 
					 | 
					
						
						
							
						
						b5821b4bef
					 | 
					
						
						
							
							!132 优化一键改包的实现,增强对 win 的兼容性
						
						
						
						
						
						
						
						Merge pull request !132 from 芋道源码/feature/project-reactor 
						
						
					 | 
					
						2022-04-20 12:58:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						946735ac24
					 | 
					
						
						
							
							优化一键改码的实现,解决 win 和 mac 的兼容性问题,修复 png、jpg 等文件的编码问题
						
						
						
						
						
						
					 | 
					
						2022-04-20 20:56:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								YunaiV
							
						 
					 | 
					
						
						
							
						
						ceb76e7190
					 | 
					
						
						
							
							优化注释,修复 mac 的兼容性问题
						
						
						
						
						
						
					 | 
					
						2022-04-20 12:52:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						93352b5386
					 | 
					
						
						
							
							完善手机密码登录和Vuex状态管理
						
						
						
						
						
						
					 | 
					
						2022-04-20 03:08:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfmind
							
						 
					 | 
					
						
						
							
						
						671b5d343e
					 | 
					
						
						
							
							调整页面在微信模拟器下的样式
						
						
						
						
						
						
					 | 
					
						2022-04-19 17:58:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |