Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/agentMachineList.jsp

@@ -64,6 +64,7 @@
 				<option value="ttkdex">天天快递</option>
 				<option value="stars">星晨急便</option>
 				<option value="jd">京东快递</option>
+				<option value="dbkd">德邦快递</option>
 				<option value="01">其他</option>
 				<option value="02">上门送货</option>
 			</select>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/list.jsp

@@ -57,6 +57,7 @@
 				<option value="ttkdex">天天快递</option>
 				<option value="stars">星晨急便</option>
 				<option value="jd">京东快递</option>
+				<option value="dbkd">德邦快递</option>
 				<option value="01">其他</option>
 				<option value="02">上门送货</option>
 			</select>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/order/order.jsp

@@ -101,6 +101,7 @@
 					  	<c:when test="${order.salesPostFirm == 'ttkdex' }">天天快递</c:when>
 					  	<c:when test="${order.salesPostFirm == 'stars' }">星晨急便</c:when>
 					  	<c:when test="${order.salesPostFirm == 'jd' }">京东快递</c:when>
+					  	<c:when test="${order.salesPostFirm == 'dbkd' }">德邦快递</c:when>
 					  	<c:when test="${order.salesPostFirm == '01' }">其他</c:when>
 					  	<c:when test="${order.salesPostFirm == '02' }">上门送货</c:when>
 				  	</c:choose>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -53,6 +53,7 @@
 					<option value="ttkdex">天天快递</option>
 					<option value="stars">星晨急便</option>
 					<option value="jd">京东快递</option>
+					<option value="dbkd">德邦快递</option>
 					<option value="01">其他</option>
 					<option value="02">上门送货</option>
 				</select>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/order/probationOrderInfo.jsp

@@ -86,6 +86,7 @@
 					  	<c:when test="${pOrder.probationPostFirm == 'ttkdex' }">天天快递</c:when>
 					  	<c:when test="${pOrder.probationPostFirm == 'stars' }">星晨急便</c:when>
 					  	<c:when test="${pOrder.probationPostFirm == 'jd' }">京东快递</c:when>
+					  	<c:when test="${pOrder.probationPostFirm == 'dbkd' }">德邦快递</c:when>
 					  	<c:when test="${pOrder.probationPostFirm == '01' }">其他</c:when>
 					  	<c:when test="${pOrder.probationPostFirm == '02' }">上门送货</c:when>
 				  	</c:choose>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/rent/machine/filterInfo.jsp

@@ -78,6 +78,7 @@
                                 <c:when test="${logs.logsPostFirm == 'ttkdex' }">天天快递</c:when>
                                 <c:when test="${logs.logsPostFirm == 'stars' }">星晨急便</c:when>
                                 <c:when test="${logs.logsPostFirm == 'jd' }">京东快递</c:when>
+                                <c:when test="${logs.logsPostFirm == 'dbkd' }">德邦快递</c:when>
                                 <c:when test="${logs.logsPostFirm == '01' }">其他</c:when>
                                 <c:when test="${logs.logsPostFirm == '02' }">上门送货</c:when>
                             </c:choose>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/rent/machine/filterList.jsp

@@ -52,6 +52,7 @@
 					<option value="ttkdex">天天快递</option>
 					<option value="stars">星晨急便</option>
 					<option value="jd">京东快递</option>
+					<option value="dbkd">德邦快递</option>
 					<option value="01">其他</option>
 					<option value="02">上门送货</option>
 				</select>

watero-wechat-web/src/main/webapp/WEB-INF/views/admin/rent/order/list.jsp

@@ -52,6 +52,7 @@
 					<option value="ttkdex">天天快递</option>
 					<option value="stars">星晨急便</option>
 					<option value="jd">京东快递</option>
+					<option value="dbkd">德邦快递</option>
 					<option value="01">其他</option>
 					<option value="02">上门送货</option>
 				</select>

watero-wechat-web/src/main/webapp/view/rent/lease_order_details.html

@@ -438,6 +438,9 @@
             case '02':
                 return '上门送货';
                 break;
+            case 'dbkd':
+                return '德邦快递';
+                break;
         }
     }
 </script>