Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/businessDetailActivity/BusinessDetailNewActivity.java
#	app_modular/appworks/src/main/java/com/uas/appworks/adapter/BusinessStageAdapter.java

app_modular/appworks/src/main/java/com/uas/appworks/activity/businessManage/businessDetailActivity/BusinessDetailNewActivity.java

@@ -17,7 +17,6 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
-import com.common.data.NumberUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.core.app.Constants;
@@ -376,13 +375,11 @@ public class BusinessDetailNewActivity extends MvpBaseActivity<BusinessDetailCon
                     int stageIndex = i + 1;
                     mCircleProgressBar.setProgress(stageIndex);
                     try {
-                        mStageIndexTextView.setText(businessStageBean.getBS_NAME());
-//                    mStageIndexTextView.setText("第" +
+//                        mStageIndexTextView.setText("第" +
 //                                NumberUtils.translateNumber2Chinese(businessStageBean.getBS_DETNO()) + "阶段");
+                        mStageIndexTextView.setText(businessStageBean.getBS_NAME());
                     } catch (Exception e) {
-                        mStageIndexTextView.setText("");
-//                        mStageIndexTextView.setText("第" +
-//                                businessStageBean.getBS_DETNO() + "阶段");
+                        mStageIndexTextView.setText(businessStageBean.getBS_NAME());
                     }
 
                     isExist = true;

app_modular/appworks/src/main/java/com/uas/appworks/adapter/BusinessStageAdapter.java

@@ -56,7 +56,7 @@ public class BusinessStageAdapter extends BaseQuickAdapter<BusinessStageBean, Ba
             helper.setTextColor(R.id.item_business_stage_point_capiton_tv, mContext.getResources().getColor(R.color.gray_default_dark));
         }
 
-        helper.setText(R.id.item_business_stage_no_tv, "" + item.getBS_NAME());
+        helper.setText(R.id.item_business_stage_no_tv, item.getBS_NAME());
         helper.setText(R.id.item_business_stage_name_tv, item.getBS_NAME());
         helper.setText(R.id.item_business_stage_explore_tv, "本阶段可停留" + item.getBS_DAYS() + "天");
         String bs_point = item.getBS_POINT();