Merge branch 'app-version-mark' into dev

# Conflicts:
#	xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionMarkController.java

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/AppVersionMarkBiz.java

@@ -12,11 +12,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import java.sql.Date;
-import java.text.DateFormat;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
-
 import java.util.List;
 
 @Service
@@ -61,7 +56,7 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
     public String getMark() {
         String mark = "";
         for (int i = 0; i < NO_RANDOM_REAPPEAR; i++) {
-            mark = getCharAndNumr3(RANDOM_TWO_LENGTH);
+            mark = getCharAndNumr(RANDOM_TWO_LENGTH);
             int count = mapper.queryIsMark(mark);
             if (count == 0) {
                 break;
@@ -76,7 +71,7 @@ public class AppVersionMarkBiz extends BaseBiz<AppVersionMarkMapper, AppVersionM
      * @param length
      * @return
      */
-    public static String getCharAndNumr3(int length) {
+    public static String getCharAndNumr(int length) {
         StringBuffer valSb = new StringBuffer();
         for (int i = 0; i < length; i++) {
             // 输出字母还是数字

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionMarkController.java

@@ -77,12 +77,15 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
      * @Date: 2020/1/10
      */
     @GetMapping("/findAllByQuery")
-    public ObjectRestResponse findAllByQuery(@RequestBody AppVersionMarkQuery query) {
+    public ObjectRestResponse findAllByQuery(@RequestParam(value = "page", defaultValue = "1") Integer page,
+                                             @RequestParam(value = "limit", defaultValue = "10") Integer limit,
+                                             @RequestParam(value = "mark",defaultValue = "") String mark) {
         Example example = new Example(AppVersionMark.class);
-        if (StringUtils.isNotBlank(query.getMarkName())) {
-            example.createCriteria().andLike("mark", "%" + query.getMark() + "%");
+        if (StringUtils.isNotBlank(mark)) {
+            example.createCriteria().andLike("mark", "%" + mark + "%");
         }
-        PageHelper.startPage(query.getPage(), query.getLimit());
+        example.setOrderByClause("`crt_time` desc");
+        PageHelper.startPage(page, limit);
         List<AppVersionMark> listPage = appVersionMarkBiz.selectByExample(example);
         return ObjectRestResponse.succ(PageInfo.of(listPage));
     }