• wangjinjing's avatar
    Merge remote-tracking branch 'origin/master' · 6ca54bf1
    wangjinjing authored
    # Conflicts:
    #	pom.xml
    #	src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
    #	src/main/java/com/cx/cn/cxquartz/job/WebSocket.java
    #	src/main/resources/file.properties
    6ca54bf1
Name
Last commit
Last update
..
Face.java Loading commit data...
FaceBoundingBox.java Loading commit data...
Ftp.java Loading commit data...
GoalStructureParam.java Loading commit data...
HeadBoundingBox.java Loading commit data...
ImageList.java Loading commit data...
LowerBoundingBox.java Loading commit data...
Metadata.java Loading commit data...
ObjectBoundingBox.java Loading commit data...
ObjectList.java Loading commit data...
Output.java Loading commit data...
Pedestrian.java Loading commit data...
PeopleRideBicyc.java Loading commit data...
PictureResult.java Loading commit data...
QuartzTaskRecordsVo.java Loading commit data...
ResultObj.java Loading commit data...
SafetyBelt.java Loading commit data...
Sbtdspsr.java Loading commit data...
Storageserver.java Loading commit data...
TraffAlarmRecord.java Loading commit data...
Traffic.java Loading commit data...
Traffpicture.java Loading commit data...
TraffpictureParam.java Loading commit data...
TransferResult.java Loading commit data...
UpperBoundingBox.java Loading commit data...