diff --git a/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php b/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php
index 113e159..6330330 100644
--- a/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php
+++ b/addons/weliam_smartcity/web/controller/store/merchant.ctrl.php
@@ -288,6 +288,7 @@ class Merchant_WeliamController {
                 $member['id'] = $_GPC['storemid'];
             }
             $register = $_GPC['register'];
+            $entData = $_GPC['ent_data'];
             if(empty($register['groupid']) && !is_store()){
                 wl_message('请设置商户所属套餐');
             }
@@ -308,9 +309,6 @@ class Merchant_WeliamController {
             $register['album'] = serialize($register['album']);
             $register['tag'] = serialize($register['tag']);
             $register['storename'] = trim($register['storename']);
-            $cc_id = $register['cc_id'];
-            $recommend = $register['recommend'];
-            unset($register['cc_id'],$register['recommend']);
             if (!empty($register['endtime'])) {
                 $register['endtime'] = strtotime($register['endtime']);
             }
@@ -424,7 +422,7 @@ class Merchant_WeliamController {
             if ($noticeflag) {
                 Member::returnIdentity($oldMid);
             }
-            MerchantDataEnt::saveData(['cc_id' => $cc_id,'recommend' => $recommend],$id);
+            MerchantDataEnt::saveData($entData,$id);
             if ($result) {
                 if (!empty($id)) {
                     //处理分类
@@ -527,13 +525,14 @@ class Merchant_WeliamController {
         }
         # 企业分类
         $category = Category::getChildCategoryAll(8,'*',true);
-        $register['cc_id'] = 0;
-        $register['recommend'] = 0;
+        $entData = ['cc_id' => 0, 'recommend' => 0, 'business' => '', 'advantage' => ''];
         if ($id) {
             $merchantDataEnt = MerchantDataEnt::getStoreEntData($id);
             if ($merchantDataEnt) {
-                $register['cc_id'] = $merchantDataEnt['cc_id'];
-                $register['recommend'] = $merchantDataEnt['recommend'];
+                $entData['cc_id'] = $merchantDataEnt['cc_id'];
+                $entData['recommend'] = $merchantDataEnt['recommend'];
+                $entData['business'] = $merchantDataEnt['business'];
+                $entData['advantage'] = $merchantDataEnt['advantage'];
             }
         }
 
diff --git a/addons/weliam_smartcity/web/view/default/store/userEdit.html b/addons/weliam_smartcity/web/view/default/store/userEdit.html
index 2c29c14..c53770b 100644
--- a/addons/weliam_smartcity/web/view/default/store/userEdit.html
+++ b/addons/weliam_smartcity/web/view/default/store/userEdit.html
@@ -47,9 +47,9 @@
 							<div class="form-group">
 								<label class="col-sm-2 control-label">店铺分类<span class="must-fill">*</span></label>
 								<div class="col-sm-9">
-									<select name="register[cc_id]" class="form-control">
+									<select name="ent_data[cc_id]" class="form-control">
 										{loop $category $cateVal}
-										<option {if $register['cc_id'] == $cateVal['id']}selected{/if} value="{$cateVal['id']}">{$cateVal['name']}</option>
+										<option {if $entData['cc_id'] == $cateVal['id']}selected{/if} value="{$cateVal['id']}">{$cateVal['name']}</option>
 										{/loop}
 									</select>
 								</div>
@@ -224,11 +224,23 @@
 								</div>
 							</div>
 							<div class="form-group">
-								<label class="col-sm-2 control-label">店铺详情</label>
+								<label class="col-sm-2 control-label">店铺详情/企业简历</label>
 								<div class="col-sm-9">
 									{php echo tpl_diy_editor_create('register[introduction]', $register['introduction']);}
 								</div>
 							</div>
+							<div class="form-group">
+								<label class="col-sm-2 control-label">经营业务</label>
+								<div class="col-sm-9">
+									{php echo tpl_diy_editor_create('ent_data[business]', $entData['business']);}
+								</div>
+							</div>
+							<div class="form-group">
+								<label class="col-sm-2 control-label">企业优势</label>
+								<div class="col-sm-9">
+									{php echo tpl_diy_editor_create('ent_data[advantage]', $entData['advantage']);}
+								</div>
+							</div>
 							<div class="form-group">
 								<label class="col-sm-2 control-label">所在区域<span class="must-fill">*</span></label>
 								<div class="col-sm-9">
@@ -293,10 +305,10 @@
 								<label class="col-sm-2 control-label">推荐</label>
 								<div class="col-sm-9">
 									<label class="radio-inline">
-										<input type="radio" name="register[recommend]" value="0" {if $register['recommend']==0}checked{/if}> 否
+										<input type="radio" name="ent_data[recommend]" value="0" {if $entData['recommend']==0}checked{/if}> 否
 									</label>
 									<label class="radio-inline">
-										<input type="radio" name="register[recommend]" value="1" {if $register['recommend']==1}checked{/if}> 是
+										<input type="radio" name="ent_data[recommend]" value="1" {if $entData['recommend']==1}checked{/if}> 是
 									</label>
 								</div>
 							</div>