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

优化

See merge request quanshu/mp-server!656

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketAwardsPrizeServiceImpl.java

@@ -26,6 +26,7 @@ public class TicketAwardsPrizeServiceImpl extends ServiceImpl<TicketAwardsPrizeM
 
   @Override
   public List<TicketAwardsPrize> listByQueryWrapper(QueryWrapper<TicketAwardsPrize> queryWrapper) {
+    queryWrapper.eq("t1.is_deleted", 0);
     return getBaseMapper().listByQueryWrapper(queryWrapper);
   }