Merge remote-tracking branch 'origin/master'

admin

2019-03-01 a5b74cb17159f71dac98b3e7ae81e43fce73a3f9

 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java

@@ -24,7 +24,7 @@
    */

   public static MsgOrderDetail createFanLiOrder(Long uid, String orderId, int goodsCount, int orderState,

         BigDecimal payMoney, BigDecimal money, String beiZhu) {

      if (payMoney == null || money == null || uid == null)

      if (uid == null)

         return null;

      MsgOrderDetail detail = new MsgOrderDetail();

      detail.setBeiZhu(beiZhu);