Merge branch 'renew_upgrade' into pre

netflix-dao/src/main/java/com/cyksj/model/manage/views/RenewUpgradeOrderDonView.java

@@ -18,8 +18,8 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "order_don_renew_record orr left join order_don o on o.id = orr.order_id" +
-        "left join goods_don g on g.id = o.goods_id " +
-        "left join goods_don_sku sku on o.sku_id = sku.id ")
+        " left join goods_don g on g.id = o.goods_id" +
+        " left join goods_don_sku sku on o.sku_id = sku.id")
 public class RenewUpgradeOrderDonView {
 
     @DbField("o.id")