Merge branch 'master' of http://git.izouma.com/xiongzhu/pms

src/main/java/com/izouma/zhumj/domain/Company.java

@@ -0,0 +1,23 @@
+package com.izouma.zhumj.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel(value = "公司信息", description = "公司信息")
+public class Company extends BaseEntity {
+    private String companyName;
+    private String companyPrincipal;
+    private String appId;
+    private String paySecret;
+    private Long   userId;
+}

src/main/java/com/izouma/zhumj/domain/StoreInfo.java

@@ -29,6 +29,8 @@ import java.util.List;
 @ApiModel(value = "门店信息", description = "门店信息")
 public class StoreInfo extends BaseEntity implements Serializable {
 
+    private Long companyId;
+
     @Column(nullable = false)
     @Searchable
     @ApiModelProperty(value = "门店名称", name = "storeName")

src/main/java/com/izouma/zhumj/domain/User.java

@@ -30,6 +30,7 @@ import java.util.Set;
 @Where(clause = "enabled = 1")
 @ApiModel(value = "用户", description = "用户")
 public class User extends BaseEntity implements Serializable {
+    private Long companyId;
 
     @Pattern(regexp = Constants.Regex.USERNAME)
     @Size(min = 1, max = 50)