bugfix

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -662,7 +662,7 @@ public class NewCmShopController extends BaseController {
                 list.add("新增了注册资本");
             }
         }
-        if (newCmShops.getRegisteredCapital() != null) {
+        if (newCmShop.getRegisteredCapital() != null) {
             if (!newCmShop.getRegisteredCapital().equals(newCmShops.getRegisteredCapital()) ) {
                 list.add("修改了注册资本");
             }

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

@@ -320,7 +320,7 @@
             </td>
            <td>   <%--  <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}（${cmDiscernReceipt.orderID}）</a>--%>
                 <c:if test="${cmDiscernReceipt.receiptType eq 2}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNos}（${cmDiscernReceipt.orderID}）</a></c:if>
-                <c:if test="${cmDiscernReceipt.receiptType != 6 || cmDiscernReceipt.receiptType != 2}">${cmDiscernReceipt.orders}</c:if>
+                <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orders}</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>