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
238d8c9a
Commit
238d8c9a
authored
Dec 30, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-vehicle-bug'
parents
5cc31ee5
b579d035
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-1
AuthController.java
...thub/wxiaoqi/security/auth/controller/AuthController.java
+1
-1
Vehicle.java
...c/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java
+6
-0
AddOrUpdateVehicleVo.java
.../com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java
+5
-0
No files found.
ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java
View file @
238d8c9a
...
...
@@ -190,7 +190,7 @@ public class AuthController {
data
.
put
(
"status"
,
1001
);
}
else
{
Integer
positionId
=
result
.
getInteger
(
"positionId"
)==
null
?
0
:
result
.
getInteger
(
"positionId"
);
if
(
positionId
==
4
||
positionId
==
1
||
positionId
==
2
||
positionId
==
3
){
if
(
positionId
<=
5
&&
positionId
>
0
){
String
token
=
appAuthService
.
getToken
(
username
,
result
.
getInteger
(
"userId"
));
data
.
put
(
"token"
,
token
);
}
else
{
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java
View file @
238d8c9a
...
...
@@ -66,6 +66,12 @@ public class Vehicle {
private
Integer
strongInsuranceCompany
;
/**
* 电子保单
*/
@Column
(
name
=
"insurance_pdf"
)
private
String
insurancePDF
;
/**
* 保险单号
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java
View file @
238d8c9a
...
...
@@ -166,4 +166,9 @@ public class AddOrUpdateVehicleVo {
* 通讯类型
*/
private
String
communicationType
;
/**
* 电子保单
*/
private
String
insurancePDF
;
}
\ No newline at end of file
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