Merge branch 'develop' into product

app/containers/quickOrder/QuickOrderPage.js

@@ -1814,7 +1814,7 @@ class EquipConsuPage extends Component {
                     closeModal={(show) => this.closeDateModal(show)}
                     show={dateModelPop}
                     callback={(date) => this.dateModalCallback(date, listOptionData[8])}
-                    minuteInterval={60}
+                    minuteInterval={30}
                 />
                 { this.renderPickerModel() }
             </View>

app/containers/selfOrder/SelfOrderPage.js

@@ -2056,7 +2056,7 @@ class SelfOrderPage extends Component {
                     closeModal={(show) => this.closeDateModal(show)}
                     show={dateModelPop}
                     callback={(date) => this.dateModalCallback(date, listOptionData[6])}
-                    minuteInterval={60}
+                    minuteInterval={30}
                 />
                 { this.renderPickerModel()}
                 {/* { this.renderTipModelPackage()}