Merge remote-tracking branch 'origin/master'

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpaymentfujian/mapper/xml/HlgPaymentDetailFujianMapper.xml

@@ -43,6 +43,9 @@
         <where>
             ${ew.sqlSegment}
             and a.del_flag = '0'
+			<if test="hlgPaymentDetailFujian.paymentId != null">
+				and a.payment_id = #{hlgPaymentDetailFujian.paymentId}
+			</if>
 			<if test="hlgPaymentDetailFujian.userName != null and hlgPaymentDetailFujian.userName !=''">
 				and a.user_name like concat('%',#{hlgPaymentDetailFujian.userName},'%')
 			</if>

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgpaymentfujian/mapper/xml/HlgPaymentFujianMapper.xml

@@ -48,7 +48,7 @@
                 and com.company_name LIKE concat('%',#{hlgPaymentFujian.companyName},'%')
             </if>
         </where>
-        ORDER BY a.update_time DESC,a.id ASC
+        ORDER BY a.payment_time DESC,a.id ASC
     </select>
 
     <insert id="savePayment">