Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-14 4dadac0d032c1b2543ff9bd7251d73a90f8e3b11

 server/service/src/main/java/com/doumee/service/system/SystemLoginService.java

@@ -16,5 +16,5 @@
     * @author Eva.Caesar Liu
     * @date 2023/03/21 14:49
     */
    String loginByPassword (LoginDTO dto, HttpServletRequest request);
    String loginByPassword (LoginDTO dto,int type, HttpServletRequest request);
}