提交分类 修复BUG；

提交内容	服务预约修复备注问题；
当前版本	测试版本6.1.0
是否冲突	是
Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_fix

# Conflicts:
#	WeiChat/version.properties
#	app_core/common/src/main/java/com/core/app/Constants.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Dec 11 16:07:47 CST 2017
-debugName=115
+#Mon Dec 11 17:33:46 CST 2017
+debugName=117
 versionName=618
-debugCode=115
+debugCode=117
 versionCode=157

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -16,6 +16,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -111,6 +112,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
     private LinearLayout llPanelBusiness;
     private TextView tvSeatsLeft;
     private TextView tvSeatsRight;
+    private RelativeLayout notes_rl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -182,6 +184,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         tvSeatsRight=findViewById(R.id.tvSeatsRight);
         llPanelWait=(LinearLayout)findViewById(R.id.llPanelWait);
         llPanelBusiness=(LinearLayout)findViewById(R.id.llPanelBusiness);
+        notes_rl =(RelativeLayout)findViewById(R.id.notes_rl);
                 
         submit_btn.setOnClickListener(this);
         et_book_name.setText(CommonUtil.getName());
@@ -1150,7 +1153,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         if (!isEdited) {
             et_book_phone.setText(data.getString("sb_telephone"));
             et_book_name.setText(data.getString("sb_recordor"));
-            et_book_notes.setText(data.getString("sb_remark"));
+            if (!StringUtil.isEmpty(data.getString("sb_remark"))){
+                et_book_notes.setText(data.getString("sb_remark"));
+                notes_rl.setVisibility(View.VISIBLE);
+            }else{
+                notes_rl.setVisibility(View.GONE);
+            }
             et_book_phone.setKeyListener(null);
             et_book_name.setEnabled(false);
             et_book_notes.setEnabled(false);