Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 624c9eec90d59297800f03276f8518daa1bd9f94

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/User.java

@@ -87,10 +87,12 @@
   /**
    * 对象类型（1=平台，2=城市管理员，3=门店）
    */
   @TableField("objectType")
   private Integer objectType;
   /**
    * objectId
    */
   @TableField("objectId")
   private Integer objectId;