合并代码;

app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java

@@ -1091,7 +1091,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
     }
 
 
-    public List<Dis> getPreferentialProject() {
+    public List<Dis> getDisList() {
         Dis dis = new Dis(C.DIS_TYPE.DIS);
         Dis moneyOff = new Dis(C.DIS_TYPE.MONEY_OFF);
         Dis promotion = new Dis(C.DIS_TYPE.PROMOTION);
@@ -1130,7 +1130,6 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
             disList.add(promotion);
         }
 
-
         return disList;
     }