Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/SupplierController.java

@@ -52,7 +52,7 @@ public class SupplierController extends BaseController {
     //@RequiresPermissions("ims:supplier:list")
     @GetMapping("/list")
     public TableDataInfo list(SupplierPageDTO supplierPageDTO) {
-        if(supplierPageDTO.getIsPaging() == 2){
+        if(supplierPageDTO.getIsPaging() == 2 || supplierPageDTO.getIsPaging() == null) {
             startPage();
         }
         List<SupplierPageVO>list = supplierService.selectSupplierList(supplierPageDTO);