Merge branch '03/03GRADE' into test

src/constant/index.js

@@ -335,5 +335,6 @@ export const backType = {
   PRACTICE :'网管课关闭',
   MUSIC :'乐团退团',
   GOODS:'商品退费',
-  SUBJECT_CHANGE:'声部更换'
+  SUBJECT_CHANGE:'声部更换',
+  CANCEL_ACTIVITY_COURSE:'取消活动资格'
 }

src/views/luckyDraw/trophyCreate.vue

@@ -267,7 +267,7 @@ export default {
               ),
               stock: item.stock,
               isDefault: item.isDefault,
-              memo: form.memo,
+              memo: item.memo,
               enabled: 1,
               id: item.id || null,
             });