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

app_modular/appworks/src/main/java/com/uas/appworks/activity/ScheduleSettingActivity.java

@@ -76,7 +76,7 @@ public class ScheduleSettingActivity extends BaseActivity {
                 Intent intent = new Intent(ct, SelectActivity.class);
                 intent.putExtra("type", 2);
                 intent.putParcelableArrayListExtra("data", beans);
-                intent.putExtra("title", getString(R.string.select_approvel_people));
+                intent.putExtra("title", "默认提示时间");
                 startActivityForResult(intent, 0x11);
             } else if (R.id.repeatRl == view.getId()) {
                 ArrayList<SelectBean> beans = new ArrayList<>();

app_modular/appworks/src/main/res/layout/activity_schedule_setting.xml

@@ -45,7 +45,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="提示时间默认"
+            android:text="默认提示时间"
             android:layout_marginLeft="@dimen/padding"
 
             android:layout_centerVertical="true"