Merge remote-tracking branch 'origin/master'

gateway/src/main/resources/application.yml

@@ -26,13 +26,13 @@ spring:
 
 ignore:
   whites:
-    - /wms/apiadmin/sysuser/login #pc端登录
-    - /wms/apiadmin/sysuser/register #pc端登录
-    - /wms/apiadmin/sysuser/sendMessageCode/** #发送验证码
-    - /wms/apiadmin/sysuser/sendMessageLogin/** #发送验证码
-    - /wms/apiadmin/sysuser/sendMessageUpdate/** #发送验证码
-    - /wms/apiadmin/sysuser/bindOrganization #绑定组织
-    - /wms/apiadmin/sysuser/selOrganization #绑定组织
+    - /oms/apiadmin/sysuser/login #pc端登录
+    - /oms/apiadmin/sysuser/register #pc端登录
+    - /oms/apiadmin/sysuser/sendMessageCode/** #发送验证码
+    - /oms/apiadmin/sysuser/sendMessageLogin/** #发送验证码
+    - /oms/apiadmin/sysuser/sendMessageUpdate/** #发送验证码
+    - /oms/apiadmin/sysuser/bindOrganization #绑定组织
+    - /oms/apiadmin/sysuser/selOrganization #绑定组织
 
 
 

oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java

@@ -86,4 +86,9 @@ public class SysUserFeignFallback implements SysUserFeign {
     public ResultBean delBySid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<SysUser> selectBySid(String sid) {
+        return null;
+    }
 }