Merge remote-tracking branch 'origin/master'

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -345,7 +345,11 @@ public class ApprovalController {
                 approvalInfo.setApprovalAdminId(admin.getAdminId());
             }
         }
-
+        String stareDate = request.getParameter("stareDate");
+        if(stareDate != null ){
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            approvalInfo.setApprovalCreateTime(format.parse(stareDate));
+        }
         PagedResult<ApprovalInfo> pagedResult = approvalOrderService.listApprovalInfo(pageNO, pageSize,approvalInfo,totalNum == null);
 
         if (totalNum != 0) {