Merge branch 'dev' into release

src/public/scheduler/scheduler_cross_email_pull.ts

@@ -29,6 +29,9 @@ export class CrossEmailPull extends Scheduler {
                 }
                 await EmailFun.addEmail(email)
             })
+            if (res.res.emails.length > 0) {
+                G.clientCross.callApi("email/DelCrossEmail", {eids: res.res.emails.map(e => e._id)})
+            }
         })
         await this.ctorStartTime()
     }