Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-10-25 1d8b7df974e1fbdacff7632b05bdc30d78a6a8c1

Merge remote-tracking branch 'origin/score_shop' into score_shop

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

@@ -148,7 +148,7 @@
                                </div>
                                <div class="col-sm-8 col-sm-offset-1" style="padding: 10px">
                                    <el-form-item label="活动编码" prop="actCode">
                                        <el-input v-model.number="ruleForm.actCode" placeholder="请输入最大开团数量"></el-input>
                                        <el-input v-model.number="ruleForm.actCode" placeholder="请输入活动编码"></el-input>
                                    </el-form-item>
                                </div>
                                <div class="col-sm-4 col-sm-offset-1" style="padding: 10px">