vue-pro/yudao-ui-admin
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
..
bin 多模块重构 12:修改项目名字,按照新的规则 2022-02-02 22:33:39 +08:00
build 替换var 为const/let 2022-11-08 13:31:08 +08:00
public v3.5.0 新增IE浏览器版本过低提示页面 2022-02-15 21:32:14 +08:00
src Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-13 12:07:59 +08:00
.editorconfig 多模块重构 12:修改项目名字,按照新的规则 2022-02-02 22:33:39 +08:00
.env.demo1024 vue2 验证码,增加开关、修复对社交登录的支持 2022-09-04 12:18:12 +08:00
.env.dev vue2 验证码,增加开关、修复对社交登录的支持 2022-09-04 12:18:12 +08:00
.env.local vue2 验证码,增加开关、修复对社交登录的支持 2022-09-04 12:18:12 +08:00
.env.prod vue2 验证码,增加开关、修复对社交登录的支持 2022-09-04 12:18:12 +08:00
.env.stage vue2 验证码,增加开关、修复对社交登录的支持 2022-09-04 12:18:12 +08:00
.eslintignore mall:上传enum类,做后端模板添加判定、前端页面添加 2022-08-16 00:26:44 +08:00
.eslintrc.js update vue 2.7.0 2022-11-08 12:23:15 +08:00
.gitignore [Github Action]修复项目CI脚本构建失败问题 2022-02-26 17:07:27 +08:00
.npmrc perf: 增加.npmrc文件,默认使用新的淘宝镜像源 2022-05-16 20:11:57 +08:00
babel.config.js v3.8.3 reset babel 2022-07-06 09:25:32 +08:00
Jenkinsfile 多模块重构 12:修改项目名字,按照新的规则 2022-02-02 22:33:39 +08:00
package.json fix 滑块验证码error 2022-11-10 09:47:10 +08:00
vue.config.js revert 2022-08-03 13:38:02 +08:00
yarn.lock fix 滑块验证码error 2022-11-10 09:47:10 +08:00