Merge remote-tracking branch 'origin/master'

admin

2019-03-11 261609854ff8c912d70b12809153f1efc28e76ce

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -1274,7 +1274,7 @@
      String[] orderArr = order.split(",");

      for (String tbOrder : orderArr) {

         Order or = new Order();

         or.setBeizhu("系统添加");

         or.setBeizhu("接口添加");

         or.setCreatetime(java.lang.System.currentTimeMillis());

         or.setDrawbackTime(0L);

         or.setOrderId(tbOrder.trim());