Merge remote-tracking branch 'origin/dev' into dev

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java

@@ -69,8 +69,10 @@ public interface ThirdFeign {
 
     @RequestMapping(value = "/dictionary/getAll4Map", method = RequestMethod.GET)
     public ObjectRestResponse<Map<String, Dictionary>> dictionaryGetAll4Map();
-    @RequestMapping(value = "/dictionary/getAll4Map", method = RequestMethod.GET)
-    public ObjectRestResponse<Map<String, Dictionary>> getDictionaryUseType();
+
+/*    @RequestMapping(value = "/dictionary/getAll4Map", method = RequestMethod.GET)
+    public ObjectRestResponse<Map<String, Dictionary>> getDictionaryUseType();*/
+
      @PostMapping("/dictionary/type_code")
     public  Dictionary findDictionaryByTypeAndCode(@RequestParam(value = "type") String type,@RequestParam(value = "code") String code);
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/DictionaryBiz.java

@@ -114,12 +114,12 @@ public class DictionaryBiz extends BaseBiz<DictionaryMapper, Dictionary> {
         return dictionaryMap;
     }
 
-    public Map<String, Dictionary> getDictionaryUseType() {
+   /* public Map<String, Dictionary> getDictionaryUseType() {
         List<Dictionary> dictionaries = selectListAll();
         Map<String, Dictionary> dictionaryMap = dictionaries.parallelStream().collect(Collectors.toMap(dic -> dic.getType() + "_" + dic.getCode()
                 , Function.identity(), (oldValue, newValue) -> newValue));
         return dictionaryMap;
-    }
+    }*/
 
 
     @CacheClear(pre = CACHE_DICTIONARY_PREFIX)

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/DepartureLogVo.java

@@ -27,5 +27,9 @@ public class DepartureLogVo extends VehicleDepartureLog {
      */
     private Date actualEndDate;
 
+    /**
+     * 车牌号码
+     */
+    private  String numberPlate;
 
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleDepartureController.java

@@ -166,7 +166,7 @@ public class VehicleDepartureController {
      */
     @GetMapping("findReserveType")
     public ObjectRestResponse<OrderPageVO> getOrderDetail() {
-        Map<String, Dictionary> dictionaryMap = thirdFeign.getDictionaryUseType().getData();
+        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
         String reserveType = dictionaryMap.get(VEHICE_ORDER + "_" + RESERVE).getName();
         return ObjectRestResponse.succ(reserveType);
     }