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

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

 zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html

@@ -63,6 +63,16 @@
                    <option value=''>请选择项目状态</option>
                </select>
            </div>
            <div class="form-group mr-20">
                <label for="staus">业绩规则</label>
                <select class="form-control autoFull" name="achieveRuleId"
                        data-filed="name"
                        data-value="id"
                        th:data-url="@{/admin/achieveRule/selectListForm}"
                        data-param="{pageNum:1,pageSize:1000}">
                    <option value=''>请选择业绩规则</option>
                </select>
            </div>

            <div class="form-group mr-20">
                <label for="isPresent">是否赠送</label>
@@ -110,6 +120,7 @@
                <th data-field="isPresent">是否赠送</th>
                <th data-field="goodType" data-sortable="true">类型</th>
                <th data-field="cateName" >分类</th>
                <th data-field="achieveRuleName" >业绩规则</th>
                <th data-field="createTime"  data-sortable="true" data-formatter="MGrid.getTime">创建时间</th>
            </tr>
            </thead>