2 Commits 397f0656ca ... ea38afbdb1

Author SHA1 Message Date
  wuwen ea38afbdb1 Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys 3 years ago
  wuwen c6cb605519 crm 3 years ago

+ 7 - 7
src/main/java/com/ssj/sys/controller/FxController.java

@@ -2918,12 +2918,12 @@ public class FxController  extends BaseController {
 	    		myColumns3.add(new ExcelColumn("商户类别", "type", 20));
 	    		myColumns3.add(new ExcelColumn("商户名称:合作名称/合作校区", "unitName", 40));
 	    		
-	    		myColumns3.add(new ExcelColumn("套餐:套餐类型", "mealType", 20));
-	    		myColumns3.add(new ExcelColumn("套餐单价:平台管理费", "outPrice", 20));
+//	    		myColumns3.add(new ExcelColumn("套餐:套餐类型", "mealType", 20));
+//	    		myColumns3.add(new ExcelColumn("套餐单价:平台管理费", "outPrice", 20));
 	    		myColumns3.add(new ExcelColumn("关联机构", "joinName", 20));
-	    		myColumns3.add(new ExcelColumn("签约端口数量", "portNum", 20));
-	    		myColumns3.add(new ExcelColumn("服务人数	", "libService_1", 20));
-	    		myColumns3.add(new ExcelColumn("剩余机构塾币", "libService_2", 20));
+//	    		myColumns3.add(new ExcelColumn("签约端口数量", "portNum", 20));
+//	    		myColumns3.add(new ExcelColumn("服务人数	", "libService_1", 20));
+//	    		myColumns3.add(new ExcelColumn("剩余机构塾币", "libService_2", 20));
 	    		
 	    		myColumns3.add(new ExcelColumn("甲方签约人", "signerPerson", 20));
 	    		myColumns3.add(new ExcelColumn("合同编号", "contractNo", 20));
@@ -2942,9 +2942,9 @@ public class FxController  extends BaseController {
 //	    		myColumns3.add(new ExcelColumn("激活开始日期", "startActiveTimeStr", 20));
 //	    		myColumns3.add(new ExcelColumn("激活结束日期", "activeTimeStr", 20));
 //	    		myColumns3.add(new ExcelColumn("计费开始日期", "computeTimeStr", 20));
-	    		myColumns3.add(new ExcelColumn("服务结束日期", "endActiveTimeStr", 20));
+//	    		myColumns3.add(new ExcelColumn("服务结束日期", "endActiveTimeStr", 20));
 	    		
-	    		myColumns3.add(new ExcelColumn("签约数(练习册用)", "signService", 20));
+//	    		myColumns3.add(new ExcelColumn("签约数(练习册用)", "signService", 20));
 	    		
 	    		myColumns3.add(new ExcelColumn("状态", "status", 20));
 	    		myColumns3.add(new ExcelColumn("创建时间", "createTime", 20));

+ 5 - 5
src/main/resources/templates/sys/fx/merchantAllEdit.html

@@ -254,11 +254,11 @@
 		</li>
 	</ul>
 	</form>
-	<ul style="margin-bottom: 10px" >
-	  <li>
-		<input type="button" id="button" class="scbtn" value="导出商户" />
-      </li>
-	</ul>
+<!-- 	<ul style="margin-bottom: 10px" > -->
+<!-- 	  <li> -->
+<!-- 		<input type="button" id="button" class="scbtn" value="导出商户" /> -->
+<!--       </li> -->
+<!-- 	</ul> -->