Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535

 zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html

@@ -21,7 +21,7 @@
         <div class="form-group">
            <label class="col-sm-2 control-label">标签<span class="text-danger">*</span></label>
            <div class="col-sm-4">
               <input autocomplete="off" dataType="*" class="form-control" name="label" ></input>
               <input autocomplete="off" dataType="*" class="form-control" th:value="${obj?.label}" name="label" ></input>
               <div class="Validform_checktip"></div>
            </div>
         </div>
@@ -44,9 +44,9 @@
   var obj=/*[[${obj}]]*/     
   /*]]>*/
   
   var invokeUrl=basePath+"/admin/operate/add";
   if(obj.id!=null){
      invokeUrl = basePath+"/admin/operate/modify";
   var invokeUrl=basePath+"/admin/label/add";
   if(obj!=null&& obj.id!=null){
      invokeUrl = basePath+"/admin/label/modify";
   }
   var myForm=MForm.initForm({
      invokeUrl:invokeUrl,