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

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -598,7 +598,7 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                     cmUserBalanceRecord.setType("1");
                     user.setUserMoney(userMoney + refundBalanceFee);
                     user.setOnlineMoney(onlineMoney + refundOnlineBalanceFee);
-//                    user.setAbleUserMoney(ableUserMoney + refundBalanceFee + refundOnlineBalanceFee);
+                    user.setAbleUserMoney(ableUserMoney + refundBalanceFee + refundOnlineBalanceFee);
                     if (refundBalanceFee > 0) {
                         //添加线下余额收支记录
                         cmUserBalanceRecord.setBalanceType("3");

src/main/webapp/WEB-INF/views/modules/baikePage/checkBaikePage.jsp

@@ -263,7 +263,7 @@
 		<div class="control-group">
 			<label class="control-label">上市时间：</label>
 			<div class="controls">
-				<fmt:formatDate value="${cmBaikeProduct.marketTime}" pattern="yyyy-MM-dd HH:mm"/>
+				${cmBaikeProduct.marketTime}
 			</div>
 		</div>
 		<div class="control-group">
@@ -275,7 +275,7 @@
 		<div class="control-group" style="position: relative">
 			<label class="control-label">NMPA认证时间：</label>
 			<div class="controls">
-				<fmt:formatDate value="${cmBaikeProduct.nmpaTime}" pattern="yyyy-MM-dd HH:mm"/>
+				${cmBaikeProduct.nmpaTime}
 			</div>
 		</div>
 		<div class="control-group" style="width: 1000px">