Merge branch 'feature/按钮权限' into dev

src/views/goods/gift/gift.vue

@@ -354,7 +354,7 @@
                     编辑
                   </el-button>
                   <el-dropdown
-                    v-if="((scope.row.changeType === '5' && scope.row.canEdit) || scope.row.isDifferentialPricing || scope.row.canEdit) && ($getButtonLimit($buttonCode.giftCouponCode) || $getButtonLimit($buttonCode.giftTieredPricing) || $getButtonLimit($buttonCode.giftDelete))"
+                    v-if="((scope.row.changeType === '5' && scope.row.canEdit) || scope.row.isDifferentialPricing || scope.row.canEdit) && ($getButtonLimit($buttonCode.giftConversion) || $getButtonLimit($buttonCode.giftCouponCode) || $getButtonLimit($buttonCode.giftTieredPricing) || $getButtonLimit($buttonCode.giftDelete))"
                     style="margin-left:20px;"
                     @command="command => handleCommand(command, scope.row, scope.$index)"
                     placement="bottom-start"