Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!608

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserMineController.java

@@ -99,7 +99,7 @@ public class UserMineController extends BaseApiController {
         }
         // 如果为盲豆需要拼接数量
         if (TicketPrizeTypeEnum.COIN.getValue().equals(ticketListVO.getPrizeType())) {
-          ticketListVO.setPrizeInfo(ticketListVO.getPrizeInfo() + ticketListVO.getValue() + "颗");
+          ticketListVO.setPrizeInfo(ticketListVO.getPrizeInfo() + ticketListVO.getValue() + "个");
         }
       }
     }

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -356,7 +356,7 @@ public class UserTicketController extends BaseApiController {
         for (int i = 0; i < ticketHitPrizeBarrageVOList.size(); i++) {
           // 类型为盲豆则拼接数量
           if(TicketPrizeTypeEnum.COIN.getValue().equals(ticketHitPrizeBarrageVOList.get(i).getPrizeType())){
-            ticketHitPrizeBarrageVOList.get(i).setPrizeInfo(ticketHitPrizeBarrageVOList.get(i).getPrizeInfo() + ticketHitPrizeBarrageVOList.get(i).getValue() + "颗");
+            ticketHitPrizeBarrageVOList.get(i).setPrizeInfo(ticketHitPrizeBarrageVOList.get(i).getPrizeInfo() + ticketHitPrizeBarrageVOList.get(i).getValue() + "个");
           }
 
           // 设置类型为中奖
@@ -398,7 +398,7 @@ public class UserTicketController extends BaseApiController {
     for (int i = 0; i < ticketHitPrizeBarrageVOList.size(); i++) {
       // 类型为盲豆则拼接数量
       if(TicketPrizeTypeEnum.COIN.getValue().equals(ticketHitPrizeBarrageVOList.get(i).getPrizeType())){
-        ticketHitPrizeBarrageVOList.get(i).setPrizeInfo(ticketHitPrizeBarrageVOList.get(i).getPrizeInfo() + ticketHitPrizeBarrageVOList.get(i).getValue() + "颗");
+        ticketHitPrizeBarrageVOList.get(i).setPrizeInfo(ticketHitPrizeBarrageVOList.get(i).getPrizeInfo() + ticketHitPrizeBarrageVOList.get(i).getValue() + "个");
       }
 
       // 插入大奖弹幕