Merge remote-tracking branch 'origin/master'

alien-entity/src/main/resources/mapper/ManagementInfoMapper.xml

@@ -147,7 +147,7 @@
                 WHEN 1 THEN
                     "代金券"
                 WHEN 2 THEN
-                    "团购"
+                    "套餐"
                 END AS type_name,
             coupon.`name`,
             "1" AS buy_count,