Merge branch 'score_shop' into api_score_meger

jyy

2021-07-17 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5

 zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html

@@ -87,13 +87,6 @@
                                </el-button>
                            </div>
                        </el-col>
                        <el-col>
                            <div style="padding:5px;font-size: 15px;text-align: right;">
                                <el-button type="primary" size="mini" round>
                                    <span>抽奖记录</span>
                                </el-button>
                            </div>
                        </el-col>
                    </el-row>

                    <el-row>