Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

liujiandao

2023-10-13 f65ce9c19568745003b22e82060fb38c2885c701

 model/user.go

@@ -89,7 +89,7 @@
   var db = slf.Orm.Model(&User{}).Preload("Menus")

   if slf.UUID != "" {
      db = db.Where("id = ?", slf.UUID)
      db = db.Where("uuid = ?", slf.UUID)
   }

   if slf.Username != "" {