Merge branch 'master-customer-management' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppStaffUserBiz.java

@@ -13,7 +13,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.Date;
 import java.util.List;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLogRemarkBiz.java

@@ -49,7 +49,7 @@ public class AppUserLogRemarkBiz extends BaseBiz<AppUserLogRemarkMapper, AppUser
 
         Example example = new Example(AppUserLogRemark.class);
         example.createCriteria().andEqualTo("levelId", levelId);
-        example.orderBy("time").desc();
+        example.orderBy("time").desc().orderBy("crtTime").desc();
         List<AppUserLogRemark> list = selectByExample(example);
         if (CollectionUtil.isNotEmpty(list)) {
              list.parallelStream().peek(e -> {