Alawn/springboot-payment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
xiangwb
2017-11-20 16:19:48 +08:00
parent 27cbdcd8b5
commit 5f1fcea677
37 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot-web/src/main/java/com/xwbing/controller/TestControl.java
+2 -2
View File
@@ -2,8 +2,8 @@ package com.xwbing.controller;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.entity.ExpressInfo;
import com.xwbing.entity.vo.ExpressInfoVo;
import com.xwbing.domain.entity.ExpressInfo;
import com.xwbing.domain.entity.vo.ExpressInfoVo;
import com.xwbing.redis.RedisService;
import com.xwbing.service.ExpressDeliveryService;
import com.xwbing.service.QRCodeZipService;
boot-web/src/main/java/com/xwbing/controller/sys/SysAuthorityControl.java
+2 -2
View File
@@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.constant.CommonConstant;
import com.xwbing.constant.CommonEnum;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.entity.vo.SysAuthVo;
import com.xwbing.domain.entity.sys.SysAuthority;
import com.xwbing.domain.entity.vo.SysAuthVo;
import com.xwbing.redis.RedisService;
import com.xwbing.service.sys.SysAuthorityService;
import com.xwbing.util.JSONObjResult;
boot-web/src/main/java/com/xwbing/controller/sys/SysConfigControl.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.xwbing.controller.sys;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.entity.sys.SysConfig;
import com.xwbing.domain.entity.sys.SysConfig;
import com.xwbing.service.sys.SysConfigService;
import com.xwbing.util.JSONObjResult;
import com.xwbing.util.RestMessage;
boot-web/src/main/java/com/xwbing/controller/sys/SysRoleControl.java
+3 -3
View File
@@ -2,9 +2,9 @@ package com.xwbing.controller.sys;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.entity.sys.SysRole;
import com.xwbing.entity.sys.SysRoleAuthority;
import com.xwbing.domain.entity.sys.SysAuthority;
import com.xwbing.domain.entity.sys.SysRole;
import com.xwbing.domain.entity.sys.SysRoleAuthority;
import com.xwbing.service.sys.SysAuthorityService;
import com.xwbing.service.sys.SysRoleAuthorityService;
import com.xwbing.service.sys.SysRoleService;
boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java
+4 -4
View File
@@ -4,10 +4,10 @@ import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.constant.CommonConstant;
import com.xwbing.constant.CommonEnum;
import com.xwbing.entity.sys.SysAuthority;
import com.xwbing.entity.sys.SysRole;
import com.xwbing.entity.sys.SysUser;
import com.xwbing.entity.sys.SysUserRole;
import com.xwbing.domain.entity.sys.SysAuthority;
import com.xwbing.domain.entity.sys.SysRole;
import com.xwbing.domain.entity.sys.SysUser;
import com.xwbing.domain.entity.sys.SysUserRole;
import com.xwbing.service.sys.SysAuthorityService;
import com.xwbing.service.sys.SysRoleService;
import com.xwbing.service.sys.SysUserRoleService;
boot-web/src/main/java/com/xwbing/controller/sys/SysUserLoginInOutControl.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.xwbing.controller.sys;
import com.alibaba.fastjson.JSONObject;
import com.xwbing.annotation.LogInfo;
import com.xwbing.entity.sys.SysUserLoginInOut;
import com.xwbing.domain.entity.sys.SysUserLoginInOut;
import com.xwbing.service.sys.SysUserLoginInOutService;
import com.xwbing.util.JSONObjResult;
import io.swagger.annotations.Api;