You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
3 years ago
..
Breadcrumb 替换var 为const/let 3 years ago
Crontab 替换var 为const/let 3 years ago
DictTag 完成 FileConfig 的前端模块 4 years ago
DocAlert 开发环境下,管理后台每个菜单展示对应的《开发文档》的说明 4 years ago
Editor 富文本编辑器的 Editor 的图片上传报错的问题 4 years ago
FileUpload v3.8.4:修复多文件上传报错出现的异常问题 3 years ago
Hamburger 多模块重构 12:修改项目名字,按照新的规则 4 years ago
HeaderSearch 修复代码警告 3 years ago
IconSelect 多模块重构 12:修改项目名字,按照新的规则 4 years ago
ImagePreview v3.8.4:修复图片预览组件src属性为null值控制台报错问题(I5KBAS) 3 years ago
ImageUpload 修复代码警告 3 years ago
Pagination v3.8.2 修复分页组件请求两次问题 4 years ago
PanThumb 替换var 为const/let 3 years ago
ParentView 多模块重构 12:修改项目名字,按照新的规则 4 years ago
RightPanel 多模块重构 12:修改项目名字,按照新的规则 4 years ago
RightToolbar 3.8.4:优化表格上右侧工具条(搜索按钮显隐&右侧样式凸出) 3 years ago
RuoYi 多模块重构 12:修改项目名字,按照新的规则 4 years ago
Screenfull 多模块重构 12:修改项目名字,按照新的规则 4 years ago
SizeSelect 多模块重构 12:修改项目名字,按照新的规则 4 years ago
SvgIcon 多模块重构 12:修改项目名字,按照新的规则 4 years ago
ThemePicker v3.7.0 优化提示 4 years ago
TopNav 替换var 为const/let 3 years ago
Verifition 修复滑块验证码,存在失败的情况 3 years ago
VideoUpload feature(管理后台): 商品添加视频 4 years ago
bpmnProcessDesigner 替换var 为const/let 3 years ago
generator 替换var 为const/let 3 years ago
iFrame v3.6.0 封装iframe组件 4 years ago
parser 修复 form generator 组件上传文件、图片报错的问题 4 years ago
render 多模块重构 12:修改项目名字,按照新的规则 4 years ago
tinymce 多模块重构 12:修改项目名字,按照新的规则 4 years ago
RADME.md 多模块重构 12:修改项目名字,按照新的规则 4 years ago