Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/ins/controller/InsFeeDetailController.java

@@ -335,7 +335,7 @@ public class InsFeeDetailController extends BaseController {
             array.add(riskCode);
         }
         if (!StringUtils.isEmpty(startdate) && !StringUtils.isEmpty(enddate)) {
-            whereStr.append(" and DATE_FORMAT(signdate, '%Y-%m-%d') between date ? and date ?");
+            whereStr.append(" and DATE_FORMAT(signdate, '%Y-%m-%d') between DATE_FORMAT(?, '%Y-%m-%d') and DATE_FORMAT(?, '%Y-%m-%d')");
             array.add(startdate);
             array.add(enddate);
         }
@@ -455,7 +455,7 @@ public class InsFeeDetailController extends BaseController {
             array.add(riskCode);
         }
         if (!StringUtils.isEmpty(startdate) && !StringUtils.isEmpty(enddate)) {
-            whereStr.append(" and DATE_FORMAT(signdate, '%Y-%m-%d') between date ? and date ?");
+            whereStr.append(" and DATE_FORMAT(signdate, '%Y-%m-%d') between DATE_FORMAT(?, '%Y-%m-%d') and DATE_FORMAT(?, '%Y-%m-%d')");
             array.add(startdate);
             array.add(enddate);
         }
@@ -537,7 +537,7 @@ public class InsFeeDetailController extends BaseController {
         }
 
         if (!StringUtils.isEmpty(startdate) && !StringUtils.isEmpty(enddate)) {
-            whereStr.append(" and DATE_FORMAT(signdate, '%Y-%m-%d') between date ? and date ?");
+            whereStr.append(" and DATE_FORMAT(signdate, '%Y-%m-%d') between DATE_FORMAT(?, '%Y-%m-%d') and DATE_FORMAT(?, '%Y-%m-%d')");
             array.add(startdate);
             array.add(enddate);
         }