Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-01 b56c7f8fa63e0150f621b02f425053ce0d48c2f1

 fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java

@@ -77,7 +77,7 @@
               order.setOrderDate(new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd")));

               break;

            case "订单号":

               order.setOrderId(content.replace("<", "").replace(">", ""));

               order.setOrderId(content.replace("&lt;", "").replace("&gt;", "").replace("<", "").replace(">", ""));

               break;

            case "支付金额":

               order.setPayMoney(new BigDecimal(content));