Merge branch 'master' into 杭州自建平台

JmpModel/Model/BaseCharge.cs

@@ -8,11 +8,10 @@ using Microsoft.EntityFrameworkCore;
 
 namespace JmpModel.Model
 {
-    [Keyless]
     [Table("base_charge")]
     public partial class BaseCharge
     {
-        [Required]
+        [Key]
         [Column("id")]
         [StringLength(64)]
         public string Id { get; set; }

JmpModel/Model/DataContext/JunmppolicesqlContext.cs

@@ -146,7 +146,7 @@ namespace JmpModel.Model.DataContext
             if (!optionsBuilder.IsConfigured)
             {
 #warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263.
-                optionsBuilder.UseMySql("data source=192.168.2.105;port=13306;initial catalog=junmppolicesqlb;user id=root;password=Junmp123;charset=utf8;treattinyasboolean=false", Microsoft.EntityFrameworkCore.ServerVersion.Parse("5.7.38-mysql"));
+                optionsBuilder.UseMySql("data source=192.168.3.188;port=13306;initial catalog=test;user id=root;password=Junmp123;charset=utf8;treattinyasboolean=false", Microsoft.EntityFrameworkCore.ServerVersion.Parse("5.7.38-mysql"));
             }
         }