Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
0aad9ee1
Commit
0aad9ee1
authored
Aug 08, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
08436f19
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
6 deletions
+2
-6
AppUserRelationBiz.java
...github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
+1
-1
UserCouponAdminController.java
...atform/activity/rest/admin/UserCouponAdminController.java
+0
-2
VehicleModelController.java
...om/xxfc/platform/vehicle/rest/VehicleModelController.java
+1
-3
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
View file @
0aad9ee1
...
@@ -156,11 +156,11 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
...
@@ -156,11 +156,11 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
AppUserRelationTemp
relationTemp
=
new
AppUserRelationTemp
();
AppUserRelationTemp
relationTemp
=
new
AppUserRelationTemp
();
relationTemp
.
setUserId
(
pid
);
relationTemp
.
setUserId
(
pid
);
relationTemp
.
setTempId
(
userid
);
relationTemp
.
setIsDel
(
0
);
relationTemp
.
setIsDel
(
0
);
relationTemp
.
setType
(
1
);
relationTemp
.
setType
(
1
);
AppUserRelationTemp
relationTemp1
=
relationTempBiz
.
selectOne
(
relationTemp
);
AppUserRelationTemp
relationTemp1
=
relationTempBiz
.
selectOne
(
relationTemp
);
if
(
relationTemp1
==
null
){
if
(
relationTemp1
==
null
){
relationTemp
.
setTempId
(
userid
);
relationTempBiz
.
insertSelective
(
relationTemp
);
relationTempBiz
.
insertSelective
(
relationTemp
);
}
}
...
...
xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/UserCouponAdminController.java
View file @
0aad9ee1
package
com
.
xxfc
.
platform
.
activity
.
rest
.
admin
;
package
com
.
xxfc
.
platform
.
activity
.
rest
.
admin
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.serializer.SerializerFeature
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.util.excel.ExcelImport
;
import
com.github.wxiaoqi.security.common.util.excel.ExcelImport
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
import
com.github.wxiaoqi.security.common.vo.PageDataVO
;
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java
View file @
0aad9ee1
...
@@ -289,14 +289,12 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
...
@@ -289,14 +289,12 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
* @param limit
* @param limit
* @return
* @return
*/
*/
@ApiOperation
(
"优质车型"
)
@ApiOperation
(
"优质车型"
)
@GetMapping
(
value
=
"/goodList"
)
@GetMapping
(
value
=
"/goodList"
)
@IgnoreUserToken
@IgnoreUserToken
public
List
<
GoodDataVO
>
goodList
(
@RequestParam
(
value
=
"page"
)
Integer
page
,
@RequestParam
(
value
=
"limit"
)
Integer
limit
)
{
public
List
<
GoodDataVO
>
goodList
(
@RequestParam
(
value
=
"page"
)
Integer
page
,
@RequestParam
(
value
=
"limit"
)
Integer
limit
)
{
return
baseBiz
.
goodList
(
page
,
limit
);
return
baseBiz
.
goodList
(
page
,
limit
);
}
}
@ApiOperation
(
"上下架"
)
@ApiOperation
(
"上下架"
)
@PutMapping
(
value
=
"/setStatus/{id}/{status}"
)
@PutMapping
(
value
=
"/setStatus/{id}/{status}"
)
@Transactional
@Transactional
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment