Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java

jsowell-common/src/main/java/com/jsowell/common/enums/uniapp/OrderPileOccupyPayStatusEnum.java

@@ -8,7 +8,7 @@ package com.jsowell.common.enums.uniapp;
  */
 public enum OrderPileOccupyPayStatusEnum {
     UN_PAY("0", "未支付"),
-    PAYMENT_COMPLETION("1", "未支付"),
+    PAYMENT_COMPLETION("1", "支付完成"),
     NO_PAYMENT_REQUIRED("2", "无需支付"),
     ;
 

jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java

@@ -42,7 +42,7 @@ public enum ReturnCodeEnum {
 
 	CODE_ORDER_INFO_ERROR("00100019", "订单信息有误"),
 
-	CODE_QUERY_ORDER_NULL_ERROR("00100020", "查询订单为空"),
+	CODE_QUERY_ORDER_INFO_IS_NULL("00100020", "未查到相关订单信息"),
 
 	CODE_ORDER_PILE_MAPPING_ERROR("00100021", "订单与当前桩不匹配"),
 
@@ -148,8 +148,6 @@ public enum ReturnCodeEnum {
 
 	CODE_USER_UNBIND_CARNO_ERROR("00500003", "用户解绑车牌号异常"),
 
-	CODE_QUERY_ORDER_INFO_IS_NULL("00400011", "未查到相关订单信息！"),
-
 	CODE_PILE_NOT_INFO("00400012", "未查到该该桩的信息，请检查！"),
 
 	CODE_SECRET_KEY_ERROR("00400013", "填写的桩密钥有误，请检查！"),