Merge branch 'master' of http://git.picaiba.com/mt-ck/mt-qj-wms-hd

6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java

@@ -79,16 +79,16 @@ public class RunTaskUtils {
             Map<String, Object> yeya = new HashMap();
             //type=1为 入
             yeya.put("type", 1);
-            if ("YYT003".equals(startPoint.getNote())){
+            if ("YYT003".equals(currTask.getStartPosition())){
                 yeya.put("number", 3);
             }
-            if ("YYT004".equals(startPoint.getNote())){
+            if ("YYT004".equals(currTask.getStartPosition())){
                 yeya.put("number", 4);
             }
-            if ("YYT002".equals(startPoint.getNote())){
+            if ("YYT002".equals(currTask.getStartPosition())){
                 yeya.put("number", 2);
             }
-            if ("YYT001".equals(startPoint.getNote())){
+            if ("YYT001".equals(currTask.getStartPosition())){
                 yeya.put("number", 1);
             }
             String yeyaJudgeStatus = JSON.toJSONString(yeya);

6.program/wms-passport/src/main/java/com/mt/wms/passport/feign/fallback/PlatformUpmsServiceFallback.java

@@ -89,11 +89,11 @@ public class PlatformUpmsServiceFallback implements PlatformUpmsService {
      */
     @Override
     public R<LoginUser> login(String mobile, String password) {
-        if (isDebug()) {
+/*        if (isDebug()) {
             log.warn("平台通用权限管理服务不可用，使用测试用户数据");
             return R.ok(LoginUser.builder().userId(1L).mobile("13588441519").userName("jiff")
                     .orgId(1L).userType(LoginUser.USER_TYPE_PLATFORM).build());
-        }
+        }*/
         return upmsService.login(mobile, password);
     }