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

# Conflicts:
#	WeiChat/src/main/res/layout/act_task_detail.xml
#	WeiChat/src/main/res/layout/activity_save_meet.xml
#	WeiChat/version.properties

app_modular/applocation/src/main/java/com/uas/applocation/base/NativeLocationManager.java

@@ -46,7 +46,7 @@ import java.util.logging.Logger;
  * 本地定位，只负责定位
  */
 public class NativeLocationManager implements BaseLocationManager {
-    private final String DEF_OUT_CHS_COOE_TYPE = "bd09ll";//bd09ll  //WGS84
+    private final String DEF_OUT_CHS_COOE_TYPE = "WGS84";//bd09ll  //WGS84
     private final Logger MLOGGER = Logger.getLogger("NativeLocationManager");
 
     private static final String TAG = "NativeLocationManager";