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

优化

See merge request quanshu/mp-server!420

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelMyTicketController.java

@@ -115,7 +115,7 @@ public class ChannelMyTicketController extends BaseApiController {
             return AjaxResult.error("受让人信息不存在");
         }
         if (ChannelCertifyStatusEnum.NOT_CERTIFIED.equals(channel.getCertifyStatus())) {
-            return AjaxResult.error("受让人未认证");
+            return AjaxResult.error("受让门店未认证");
         }
         if (transferChannelId.equals(channel.getChannelId())) {
             return AjaxResult.error("不能转让给自己");

mp-common/src/main/java/com/qs/mp/common/enums/TicketPkgSaleStatusEnum.java

@@ -15,7 +15,7 @@ public enum TicketPkgSaleStatusEnum implements IEnum<Integer> {
 
   WAIT_SALE(1, "待售"),
   ON_SALE(2, "销售中"),
-  SALE_OUT(3, "已售罄");
+  SALE_OUT(3, "已售完");
 
   private final Integer value;
   private final String desc;