| 
							
							
								 dengxiaobing | df2c137fe2 | 清理单元测试 sql 脚本 | 2022-12-30 10:10:43 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 17d9a4e4f2 | perf: 优化数据库建表语句 | 2022-12-20 09:10:44 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 46c93b637f | chore: update deps | 2022-12-19 10:51:36 +08:00 |  | 
			
				
					| 
							
							
								 gaibu | 67435648b2 | fix: 逻辑删除唯一索引冲突的问题 | 2022-12-10 11:32:46 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | ea95115ffd | 移除云片短信渠道,解决云片的安全风险 | 2022-11-25 20:22:04 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | afc76973ce | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp # Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue | 2022-11-13 12:07:59 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | ae0227c107 | !276 阿里云OSS解析region时兼容带https的配置 Merge pull request !276 from huangyemin/master | 2022-11-12 02:23:25 +00:00 |  | 
			
				
					| 
							
							
								 YunaiV | c51ab6ad73 | 优化 Vue3 SQL 导入脚本,避免误解 | 2022-11-11 09:09:25 +08:00 |  | 
			
				
					| 
							
							
								 xingyu4j | 2e2cd448bd | chore: update devs | 2022-11-01 10:04:15 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | aea763e96e | feature(单元测试): ProductSpuServiceImpl单元测试 | 2022-10-22 17:51:26 +08:00 |  | 
			
				
					| 
							
							
								 huangyemin | eb48817f7b | sql脚本中banner菜单配置错误修改 | 2022-10-12 15:42:45 +08:00 |  | 
			
				
					| 
							
							
								 huangyemin | 29d302a901 | sql脚本执行报错问题修改 | 2022-10-12 15:28:00 +08:00 |  | 
			
				
					| 
							
							
								 ex_yang.li@ca-nio.com | f21ce954ec | Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into ly_uniapp # Conflicts:
#	yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/api/price/PriceApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/sku/ProductSkuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApiImpl.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/convert/sku/ProductSkuConvert.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderItemConvert.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
#	yudao-server/src/main/resources/application.yaml | 2022-09-15 17:09:17 +08:00 |  | 
			
				
					| 
							
							
								 ex_yang.li@ca-nio.com | 5889093a64 | 创建交易订单-单元测试 | 2022-09-15 16:57:04 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 61b0624a59 | !262 接口实现-交易订单创建(未完全实现) Merge pull request !262 from LeeYan9/ly_uniapp | 2022-09-05 13:16:11 +00:00 |  | 
			
				
					| 
							
							
								 ex_yang.li@ca-nio.com | 7bf20ec72e | 创建订单接口定义 | 2022-09-05 20:44:04 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 9632c33d27 | mall:优化商品的分类、品牌的代码 | 2022-09-05 20:03:13 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 833fd33844 | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp  Conflicts:
	sql/optional/mall/mall.sql | 2022-09-04 21:06:28 +08:00 |  | 
			
				
					| 
							
							
								 ex_yang.li@ca-nio.com | 19a703b8c9 | 创建订单接口定义 | 2022-08-26 17:47:43 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | 4a39f2d9f8 | feature(uniapp商品): 代码调整 | 2022-08-25 17:10:26 +08:00 |  | 
			
				
					| 
							
							
								 luowenfeng | 617573a59b | feature(uniapp分类): 商品创建功能以及查询功能正常使用 | 2022-08-22 20:43:12 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 020535ab3a | Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master Signed-off-by: xingyu <xingyu4j@vip.qq.com> | 2022-08-22 00:57:43 +00:00 |  | 
			
				
					| 
							
							
								 ycak47 | c53034a2dc | 首次导入sql报错的问题。 1.积木报表菜单重复
2.Banner管理SQL注释错误及主键重复 | 2022-08-16 16:03:28 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | a6a01fcb8e | 增加升级sql文件说明 | 2022-08-11 11:55:26 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 5f6926d17c | 增加升级sql文件 | 2022-08-11 11:54:07 +08:00 |  | 
			
				
					| 
							
							
								 wuxiran | d2a9a49dad | mall:更新优惠券模板sql文件 | 2022-08-09 19:47:59 +08:00 |  | 
			
				
					| 
							
							
								 wuxiran | f0ee6467b3 | mall:提交优惠券sql文件 | 2022-08-09 11:50:46 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 75d2b9a19e | mall:同步最新 SQL | 2022-08-01 23:02:14 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 58cdc0be13 | fix: fix menu active bug | 2022-08-01 09:58:19 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 340790dec4 | chore: update deps | 2022-08-01 09:47:11 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 2340f09c68 | mall:调整部分 SPU、SKU 的表设计 | 2022-07-31 02:19:18 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | fa9823161e | mall:完善商品品牌的前后端实现 | 2022-07-30 22:15:03 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 969c387764 | mall:完善商品分类的管理后台界面 | 2022-07-30 20:28:01 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 35413b52c9 | !237 集成积木报表 Merge pull request !237 from 芋道源码/feature/visual | 2022-07-29 04:51:54 +00:00 |  | 
			
				
					| 
							
							
								 YunaiV | 74c9e68a0f | 1. 修改 file 的 type 过短的问题 2. 修复 pgsql 脚本不正确的问题 | 2022-07-29 00:38:47 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | d872676748 | 完善积木报表的集成 | 2022-07-28 09:29:51 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | 40520b6c88 | fix:降级 fastjson 版本,解决新版本的 jimu 报表在 2.0.10 会报错的问题 | 2022-07-28 00:58:24 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | b2f5900abc | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/visual | 2022-07-27 22:45:40 +08:00 |  | 
			
				
					| 
							
							
								 芋道源码 | 69a7b0de57 | !220 vue3 Merge pull request !220 from xingyu/master | 2022-07-20 12:19:35 +00:00 |  | 
			
				
					| 
							
							
								 xingyu | 87f4248e2f | fix: Vue Router i18 warn | 2022-07-20 15:12:59 +08:00 |  | 
			
				
					| 
							
							
								 xingyu | 74983d7b74 | feat: vue3 menu sql | 2022-07-20 14:56:08 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | b0cdfd7afc | 完善工作流的注释 | 2022-07-20 00:34:44 +08:00 |  | 
			
				
					| 
							
							
								 jiangqiang | 5c58a377db | 新增积木报表菜单 | 2022-07-10 20:43:21 +08:00 |  | 
			
				
					| 
							
							
								 jiangqiang | 653520d85b | 积木报表SQL脚本,拦截配置,以及组件扫描包配置 | 2022-07-10 18:08:26 +08:00 |  | 
			
				
					| 
							
							
								 jiangqiang | dd726f7985 | 中英文之间加空格 | 2022-07-09 17:11:39 +08:00 |  | 
			
				
					| 
							
							
								 jiangqiang | 0ed3321719 | 修改文件表表结构 | 2022-07-08 08:44:09 +08:00 |  | 
			
				
					| 
							
							
								 jiangqiang | 36d7775171 | 1. 修改文件名和文件路径字段长度一致,因为如果不存在文件名的情况下,会使用文件路径作为字段名,防止数据库报错字段内容太长。 2. 修改type字段为ext_name,因为此字段本来就存的文件扩展名,并且新增mime_type字段,用来存储文件的类型。方便后期拓展网盘项目。
3. 修改文件路径生成方式:之前是md5,现在是sha256,降低文件碰撞概率。方便拓展网盘项目,实现秒传等功能。 | 2022-07-07 09:43:59 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | b69b74b770 | Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp  Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java | 2022-07-04 19:56:54 +08:00 |  | 
			
				
					| 
							
							
								 YunaiV | d3fe187696 | 增加 file 的文件名的字段,同步最新 SQL | 2022-06-15 08:24:06 +08:00 |  | 
			
				
					| 
							
							
								 xiaxiaoYY | 247d299cca | Banner模块 for review | 2022-05-31 16:08:10 +08:00 |  |