Merge branch 'mj' into dev

netflix-dao/src/main/java/com/cyksj/model/entity/UpgradeOrderDon.java

@@ -78,6 +78,7 @@ public class UpgradeOrderDon extends BaseEntity {
 
     private Type type;
 
+    private String shopId;
     /**
      * 买家支付id
      */