cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改Merge产生的文件名覆盖问题

Browse Source
This commit is contained in:
xuwenbo
2020-05-19 12:51:53 +08:00
parent 5db1bd8b35 ef1f414339
commit f4e849fcbc
50 changed files with 3124 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3121
sql/yxshop2.2.sql
View File

File diff suppressed because one or more lines are too long

0
yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDTO.java → yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDto.java
View File

0
yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDTO.java → yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDto.java
View File

0
yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateDTO.java → yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatTemplateDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueUserDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponUserDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreSeckillDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreVisitDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDTO.java → yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxUserExtractDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/DetailDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/DetailDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/FromatDetailDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/FromatDetailDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ProductFormatDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ProductFormatDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/StoreOrderCartInfoDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/StoreOrderCartInfoDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserBillDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserBillDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategorySmallDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategorySmallDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductSmallDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductSmallDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserSmallDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserSmallDto.java
View File

0
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDTO.java → yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/MenuDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/PermissionDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/PermissionDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDto.java
View File

0
yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserDTO.java → yshop-system/src/main/java/co/yixiang/modules/system/service/dto/UserDto.java
View File

6
yshop-system/src/main/resources/config/application-dev.yml
View File

@ -51,7 +51,7 @@ spring:
database: 0 database: 0
host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
password: password: root
#连接超时时间 #连接超时时间
timeout: 5000 timeout: 5000
@ -84,8 +84,8 @@ swagger:
# 文件存储路径 # 文件存储路径
file: file:
path: E:\yshop\file\ path: D:\yshop\file\
avatar: E:\yshop\avatar\ avatar: D:\yshop\avatar\
# 文件大小 /M # 文件大小 /M
maxSize: 100 maxSize: 100
avatarMaxSize: 5 avatarMaxSize: 5