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
62b6414c
Commit
62b6414c
authored
Nov 26, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
c1669e33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
Vehicle.java
...c/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java
+2
-1
AppVehicleApplyController.java
...xxfc/platform/vehicle/rest/AppVehicleApplyController.java
+3
-0
No files found.
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java
View file @
62b6414c
package
com
.
xxfc
.
platform
.
vehicle
.
entity
;
import
com.alibaba.fastjson.JSONObject
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -345,6 +346,6 @@ public class Vehicle {
@Transient
@ApiModelProperty
(
"改变的json"
)
private
String
changeJ
son
;
private
JSONObject
j
son
;
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehicleApplyController.java
View file @
62b6414c
package
com
.
xxfc
.
platform
.
vehicle
.
rest
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.util.BeanUtils
;
import
com.xxfc.platform.vehicle.biz.VehicleApplyBiz
;
...
...
@@ -60,6 +62,7 @@ public class AppVehicleApplyController extends BaseController<VehicleApplyBiz> {
BeanUtils
.
copyProperties
(
vehicleApply
,
vehicle
);
vehicle
.
setId
(
vehicleApply
.
getVehicleId
());
vehicle
.
setVehicleApplyId
(
vehicleApply
.
getId
());
vehicle
.
setJson
(
JSONObject
.
parseObject
(
"changeJson"
));
vehicle
.
setIsDel
(
0
);
return
ObjectRestResponse
.
succ
(
vehicle
);
}
...
...
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