Merge branch 'mj' into dev

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

@@ -44,6 +44,16 @@ public class UpgradeOrderDonView {
     @DbField("g.id")
     private Long goodsId;
 
+    @DbField("g.logo")
+    private String logo;
+
+    @DbField("up.name")
+    private String name;
+
+    @DbField("up.num")
+    private Integer num;
+
+
     @DbField("o.user_id")
     @JsonIgnore
     private Long userId;