Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml

@@ -27,7 +27,7 @@
             and p.project_type = #{param.projectType}
         </if>
         <if test="param.year != null">
-            and p.project_year = #{param.year}
+            and prfd.project_year = #{param.year}
         </if>
         <if test="param.stage != null">
             and p.stage = #{param.stage}
@@ -36,10 +36,10 @@
             and p.status = #{param.status}
         </if>
         <if test="param.startTime != null">
-            and p.create_on &gt;= #{param.startTime}
+            and prfd.create_on &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null">
-            and p.create_on &lt;= #{param.endTime}
+            and prfd.create_on &lt;= #{param.endTime}
         </if>
         <if test="param.approvalStatus != null">
             and prfd.approval_status = #{param.approvalStatus}