Merge branch 'master' of http://47.111.81.118:3000/yq/dxtop

src/main/java/com/usky/dxtop/service/impl/StaffServiceImpl.java

@@ -206,7 +206,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
                         chargeRequest.setCurrent(i);
                         chargeRequest.setSize(30);
                         CommonPage<ChargeAndDishVO> page = this.collectByMonth(chargeRequest);
-                        return Collections.singletonList(page.getRecords());
+                        return new ArrayList<>(page.getRecords());
                     },null);
             if (null != workbook) {
                 String fileName = String.format("%s.xls", "充值消费记录统计");

src/main/resources/application-dev.properties

@@ -96,7 +96,7 @@ dx.copyrightYear: 2021
 dx.demoEnabled: true
 dx.addressEnabled: false
 dx.captchaType: math
-dx.profile: C:/Users/pc/Desktop/file/
+dx.profile: C:/Users/yq/Desktop/
 
 # mq
 spring.rabbitmq.host=101.133.214.75

src/main/resources/mapper/StaffMapper.xml

@@ -96,6 +96,7 @@
                 or s.contacts like CONCAT('%',#{cr.nameOrPhone},'%')
             </if>
         </where>
+        order by creTime desc
     </select>
 
 </mapper>