Merge branch 'dev_v2.9.40_wh' of jianyu/ent_new into feature/v2.9.40

entbase/src/service/phone/phone.go

@@ -2,20 +2,21 @@
 package phone
 
 import (
-	"database/sql"
-	"entbase/src/config"
-	"fmt"
-	"log"
-	"net/rpc"
-
 	. "app.yhyue.com/moapp/jybase/api"
 	qutil "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	. "app.yhyue.com/moapp/jypkg/ent/entity"
+	. "app.yhyue.com/moapp/jypkg/ent/util"
+	"database/sql"
+	"entbase/src/config"
+	"fmt"
 	"github.com/dchest/captcha"
 	"go.mongodb.org/mongo-driver/bson"
+	"log"
+	"net/rpc"
 )
 
 type Action struct {
@@ -25,19 +26,6 @@ type Action struct {
 	sendIdentCode xweb.Mapper `xweb:"/phone/sendIdentCode"` //发短信
 	replace       xweb.Mapper `xweb:"/phone/replace/(.*)"`  //手机号更改绑定
 }
-type CompletionUserInfo struct {
-	IsEnt      bool   `json:"isEnt"`
-	PersonName string `json:"personName"`
-	EntName    string `json:"entName"`
-	Phone      string `json:"phone"`
-	Mail       string `json:"mail"`
-	EntId      int    `json:"entId"`
-}
-type Resp struct {
-	Fool           bool  `json:"fool"`
-	EntPositionId  int64 `json:"entPositionId"`
-	UserPositionId int64 `json:"userpositionId"`
-}
 
 // 已绑定的手机号
 func (a *Action) Bound() {