Merge branch 'api' into score_shop

jyy

2021-03-10 df6a117d2923400fef1ed14cd60d14f56f4a6eec

 zq-erp/src/main/resources/templates/views/admin/shop/shopCoupon-form.html

@@ -143,9 +143,14 @@
            <!--<span class="text-danger">*</span>-->
         </label>
         <div class="col-sm-4">
            <input autocomplete="off"   type="text" class="form-control" name="tag"
                  ignore="ignore"
                  th:value="${obj.tag}"nullmsg="优惠券名称不能为空">
            <select class="form-control" dataType="*" nullmsg="请选择" name="tag">
               <!--               <option value=''>请选择</option>-->
               <option value='zqyhq' th:if="${obj.tag == 'zqyhq'}" selected>专区券</option>
               <option value='zqyhq' th:unless="${obj.tag == 'zqyhq'}">专区券</option>
               <option value='gmyhq' th:if="${obj.tag == 'gmyhq'}" selected>全场券</option>
               <option value='gmyhq' th:unless="${obj.tag == 'gmyhq'}">全场券</option>
            </select>

         </div>

      </div>