czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature

Browse Source 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
This commit is contained in:
wangw
2024-04-29 09:46:09 +08:00
parent d2388d56ea 963e311b60
commit ecae487993
16 changed files with 393 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
eladmin-system/pom.xml
View File

@@ -98,10 +98,20 @@
<version>2.1.4</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.baomidou</groupId>-->
<!-- <artifactId>mybatis-plus-extension</artifactId>-->
<!-- <version>3.3.2</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId>
<version>3.3.2</version>
<artifactId>mybatis-plus-generator</artifactId>
<version>3.5.3.1</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.5.3.1</version>
</dependency>
</dependencies>
<profiles>