Merge branch 'master' of https://git.czcyedu.com/huoran/msdw_tms

src/main/resources/mapper/tms/AchievementManagementDao.xml

@@ -457,7 +457,7 @@
         <if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%')
         </if>
         <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and hpm.creationTime between
-            #{endTime} and #{startTime}
+            #{startTime} and #{endTime}
         </if>
         <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=
             date(hpm.creationTime)
@@ -520,7 +520,7 @@
             pm.projectName like concat('%',#{searchContant},'%')
         </if>
         <if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and et.creation_time between
-            #{endTime} and #{startTime}
+            #{startTime} and #{endTime}
         </if>
         <if test="month!=null and month != ''">and DATE_SUB(CURDATE(), INTERVAL #{month} month ) &lt;=
             date(et.creation_time)