Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml

@@ -27,6 +27,7 @@
             AND (i.customer_name like CONCAT('%',#{codeOrName},'%') OR i.business_code like CONCAT('%',#{codeOrName},'%'))
         </if>
         GROUP BY i.id
+        ORDER BY i.create_time DESC
     </select>
 
     <!-- 催收 -->
@@ -60,6 +61,7 @@
         <if test="acr.startTime != null and acr.endTime != null">
             AND collection_time BETWEEN #{acr.startTime} AND #{acr.endTime}
         </if>
+        ORDER BY c.collection_time DESC
     </select>
 
     <select id="moreOverdueDetail" parameterType="integer" resultType="com.daqing.financial.guarantee.model.response.MoreOverdueDetailResponse">

dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CompanyTemplate.java

@@ -38,10 +38,10 @@ public class CompanyTemplate extends BaseRowModel implements Serializable {
     @ExcelProperty(value = "注册时间(eg:2020-02-20)", index = 3)
     private Date registerTime;
 
-    @ExcelProperty(value = "注册资金", index = 4)
+    @ExcelProperty(value = "注册资金(万元)", index = 4)
     private String registeredCapital;
 
-    @ExcelProperty(value = "员工人数", index = 5)
+    @ExcelProperty(value = "员工人数(人)", index = 5)
     private String empNum;
 
     @ExcelProperty(value = "注册地址", index = 6)
@@ -67,7 +67,7 @@ public class CompanyTemplate extends BaseRowModel implements Serializable {
     @ExcelProperty(value = "法人-姓名", index = 12)
     private String legalName;
 
-    @ExcelProperty(value = "法人-性别 1、男，0、女", index = 13)
+    @ExcelProperty(value = "法人-性别 1:男，0:女", index = 13)
     private Integer legalGender;
 
     @ExcelProperty(value = "法人-身份证号", index = 14)