czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangw 2025-02-13 09:46:42 +08:00
parent 7d90516283 27d16c8943
commit 506efc04a2
9 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/account-server/src/main/java/com/czg/controller/AuthorizationController.java → cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java
View File

@ -1,4 +1,4 @@
package com.czg.controller;
package com.czg.controller.admin;
import com.czg.account.dto.SysLoginDTO;
import com.czg.account.service.AuthorizationService;

4
cash-api/account-server/src/main/java/com/czg/controller/CommonController.java → cash-api/account-server/src/main/java/com/czg/controller/admin/CommonController.java
View File

@ -1,4 +1,4 @@
package com.czg.controller;
package com.czg.controller.admin;
import com.czg.account.service.CommonService;
import com.czg.resp.CzgResult;
@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
/**
* 公共接口
* @author Administrator

2
cash-api/account-server/src/main/java/com/czg/controller/MenuController.java → cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java
View File

@ -1,4 +1,4 @@
package com.czg.controller;
package com.czg.controller.admin;
import com.czg.account.service.SysMenuService;
import com.czg.resp.CzgResult;

4
cash-api/account-server/src/main/java/com/czg/controller/MerchantRegisterController.java → cash-api/account-server/src/main/java/com/czg/controller/admin/MerchantRegisterController.java
View File

@ -1,4 +1,4 @@
package com.czg.controller;
package com.czg.controller.admin;
import com.czg.account.dto.PageDTO;
import com.czg.account.dto.register.MerchantRegisterDTO;
@ -12,8 +12,6 @@ import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
/**
* 激活码管理
* @author Administrator

2
cash-api/account-server/src/main/java/com/czg/controller/RoleController.java → cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java
View File

@ -1,4 +1,4 @@
package com.czg.controller;
package com.czg.controller.admin;
import com.czg.account.dto.PageDTO;
import com.czg.account.dto.role.RoleAddDTO;

2
cash-api/account-server/src/main/java/com/czg/controller/ShopInfoController.java → cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
View File

@ -1,4 +1,4 @@
package com.czg.controller;
package com.czg.controller.admin;
import com.czg.account.dto.PageDTO;
import com.czg.account.dto.shopinfo.ShopInfoAddDTO;

3
cash-api/account-server/src/main/java/com/czg/controller/ShopMerchantController.java → cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java
View File

@ -1,4 +1,4 @@
package com.czg.controller;
package com.czg.controller.admin;
import com.czg.account.dto.merchant.ShopMerchantEditDTO;
import com.czg.account.entity.ShopMerchant;
@ -6,7 +6,6 @@ import com.czg.account.service.ShopMerchantService;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.annotation.SaAdminCheckRole;
import com.czg.resp.CzgResult;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

2
cash-api/account-server/src/main/java/com/czg/controller/ShopStaffController.java → cash-api/account-server/src/main/java/com/czg/controller/admin/ShopStaffController.java
View File

@ -1,4 +1,4 @@
package com.czg.controller;
package com.czg.controller.admin;
import com.czg.account.dto.staff.ShopStaffAddDTO;
import com.czg.account.dto.staff.ShopStaffEditDTO;

2
cash-api/account-server/src/main/java/com/czg/controller/UserAuthorizationController.java → cash-api/account-server/src/main/java/com/czg/controller/user/UserAuthorizationController.java
View File

@ -1,4 +1,4 @@
package com.czg.controller;
package com.czg.controller.user;
import com.czg.account.dto.auth.LoginTokenDTO;
import com.czg.account.dto.auth.UserAuthorizationLoginDTO;