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
c45113c9
Commit
c45113c9
authored
Nov 15, 2019
by
libin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2019-11-15-vehicle'
parents
e3fa0422
7bd29df6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
AppUserSellingWaterMapper.xml
...n/src/main/resources/mapper/AppUserSellingWaterMapper.xml
+1
-1
Vehicle.java
...c/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java
+5
-0
AddOrUpdateVehicleVo.java
.../com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java
+5
-0
No files found.
ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml
View file @
c45113c9
...
@@ -82,6 +82,6 @@ FROM
...
@@ -82,6 +82,6 @@ FROM
and `waiting`= #{wating} and
<![CDATA[
and `waiting`= #{wating} and
<![CDATA[
o.`type`<>
1 ]]>
o.`type`<>
1 ]]>
</if>
</if>
ORDER BY `crt_time`
ORDER BY `crt_time`
DESC
</select>
</select>
</mapper>
</mapper>
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java
View file @
c45113c9
...
@@ -121,6 +121,11 @@ public class Vehicle {
...
@@ -121,6 +121,11 @@ public class Vehicle {
*/
*/
private
String
drivingLicensePath
;
private
String
drivingLicensePath
;
/**
*行驶证副本
*/
private
String
drivingLicenseDuplicatePath
;
/**
/**
* 发动机号
* 发动机号
*/
*/
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java
View file @
c45113c9
...
@@ -118,6 +118,11 @@ public class AddOrUpdateVehicleVo {
...
@@ -118,6 +118,11 @@ public class AddOrUpdateVehicleVo {
*/
*/
private
String
drivingLicensePath
;
private
String
drivingLicensePath
;
/**
* 行驶副本
*/
private
String
drivingLicenseDuplicatePath
;
/**
/**
* 发动机号
* 发动机号
*/
*/
...
...
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