修改首页图表+用户排序

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/controller/HlwPaymentDetailController.java

@@ -387,7 +387,7 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
             LocalDate lastDate = localDate.minusMonths(i + 1);
             int increasedUser = hlwUserMapper.monthAddUser(DateUtils.asDate(lastDate));
             map.put("value", increasedUser);
-            map.put("x", lastDate.toString().substring(0, 7));
+            map.put("x", lastDate.getMonthValue()+"月");
             list.add(0, map);
         }
 
@@ -424,7 +424,7 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
             LocalDate lastDate = localDate.minusMonths(i + 1);
             int monthOrder1 = hlwOrderMapper.monthAddOrder(DateUtils.asDate(lastDate));
             map.put("value", monthOrder1);
-            map.put("x", lastDate.toString().substring(0, 7));
+            map.put("x",  lastDate.getMonthValue()+"月");
             list1.add(0, map);
         }
         list.add(list1);

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwuser/mapper/xml/HlwUserMapper.xml

@@ -83,7 +83,7 @@
             <if test="hlwUser.contractUpload != null">
                 having  contractUpload =#{hlwUser.contractUpload}
             </if>
-            order by hd.update_time,a.id asc
+            order by a.update_time,a.id asc
     </select>