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

jiaosong

2023-09-19 9c20f268e0628017d09427989724cdf2a8e9e8e2

 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);
}