Chopper fe8523ca3f Merge branch 'backup' ...

# Conflicts:
#	manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
#	manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
#	manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
#	manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
#	manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
#	manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java

2021-07-25 17:51:05 +08:00

..

src

Merge branch 'backup'

2021-07-25 17:51:05 +08:00

pom.xml

初步调整结构完成

2021-07-21 15:23:47 +08:00