修改

ace-modules/ace-admin-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ace-modules</artifactId>
+        <groupId>com.github.wxiaoqi</groupId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ace-admin-api</artifactId>
+
+
+</project>
\ No newline at end of file

ace-modules/ace-admin/pom.xml

@@ -30,6 +30,10 @@
         <pagehelper.version>4.1.1</pagehelper.version>
     </properties>
     <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>com.github.wxiaoqi</groupId>-->
+<!--            <artifactId>ace-admin-api</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.github.wxiaoqi</groupId>
             <artifactId>ace-common</artifactId>

ace-modules/pom.xml

@@ -16,5 +16,6 @@
         <module>ace-interface</module>
         <module>ace-generator</module>
         <module>ace-tool</module>
+        <module>ace-admin-api</module>
     </modules>
 </project>
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/github/wxiaoqi/security/admin/entity/User.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+@Table(name = "base_user")
+public class User {
+    @Id
+    @GeneratedValue(generator = "JDBC")//此处加上注解
+    private Integer id;
+
+    private String username;
+
+    private String password;
+
+    private String name;
+
+    private String birthday;
+
+    private String address;
+
+    @Column(name = "mobile_phone")
+    private String mobilePhone;
+
+    @Column(name = "tel_phone")
+    private String telPhone;
+
+    private String email;
+
+    private String sex;
+
+    private String type;
+
+    @Column(name = "status")
+    private Integer status;
+
+    @Column(name = "zone_id")
+    private Integer zoneId;
+
+    @Column(name = "company_id")
+    private Integer companyId;
+
+    private String description;
+
+    @Column(name = "crt_time")
+    private Date crtTime;
+
+    @Column(name = "crt_user")
+    private String crtUser;
+
+    @Column(name = "crt_name")
+    private String crtName;
+
+    @Column(name = "crt_host")
+    private String crtHost;
+
+    @Column(name = "upd_time")
+    private Date updTime;
+
+    @Column(name = "upd_user")
+    private String updUser;
+
+    @Column(name = "upd_name")
+    private String updName;
+
+    @Column(name = "upd_host")
+    private String updHost;
+
+    @Column(name = "data_all")
+    private Integer dataAll;
+
+    @Column(name = "data_zone")
+    private String dataZone;
+
+    @Column(name = "data_company")
+    private String dataCompany;
+
+    private String attr1;
+
+    private String attr2;
+
+    private String attr3;
+
+    private String attr4;
+
+    private String attr5;
+
+    private String attr6;
+
+    private String attr7;
+
+    private String attr8;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * @return username
+     */
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * @param username
+     */
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    /**
+     * @return password
+     */
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * @param password
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    /**
+     * @return name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return birthday
+     */
+    public String getBirthday() {
+        return birthday;
+    }
+
+    /**
+     * @param birthday
+     */
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    /**
+     * @return address
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * @param address
+     */
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    /**
+     * @return mobile_phone
+     */
+    public String getMobilePhone() {
+        return mobilePhone;
+    }
+
+    /**
+     * @param mobilePhone
+     */
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone;
+    }
+
+    /**
+     * @return tel_phone
+     */
+    public String getTelPhone() {
+        return telPhone;
+    }
+
+    /**
+     * @param telPhone
+     */
+    public void setTelPhone(String telPhone) {
+        this.telPhone = telPhone;
+    }
+
+    /**
+     * @return email
+     */
+    public String getEmail() {
+        return email;
+    }
+
+    /**
+     * @param email
+     */
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    /**
+     * @return sex
+     */
+    public String getSex() {
+        return sex;
+    }
+
+    /**
+     * @param sex
+     */
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    /**
+     * @return type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @param type
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getZoneId() {
+        return zoneId;
+    }
+
+    public void setZoneId(Integer zoneId) {
+        this.zoneId = zoneId;
+    }
+
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * @return description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @param description
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * @return crt_time
+     */
+    public Date getCrtTime() {
+        return crtTime;
+    }
+
+    /**
+     * @param crtTime
+     */
+    public void setCrtTime(Date crtTime) {
+        this.crtTime = crtTime;
+    }
+
+    /**
+     * @return crt_user
+     */
+    public String getCrtUser() {
+        return crtUser;
+    }
+
+    /**
+     * @param crtUser
+     */
+    public void setCrtUser(String crtUser) {
+        this.crtUser = crtUser;
+    }
+
+    /**
+     * @return crt_name
+     */
+    public String getCrtName() {
+        return crtName;
+    }
+
+    /**
+     * @param crtName
+     */
+    public void setCrtName(String crtName) {
+        this.crtName = crtName;
+    }
+
+    /**
+     * @return crt_host
+     */
+    public String getCrtHost() {
+        return crtHost;
+    }
+
+    /**
+     * @param crtHost
+     */
+    public void setCrtHost(String crtHost) {
+        this.crtHost = crtHost;
+    }
+
+    /**
+     * @return upd_time
+     */
+    public Date getUpdTime() {
+        return updTime;
+    }
+
+    /**
+     * @param updTime
+     */
+    public void setUpdTime(Date updTime) {
+        this.updTime = updTime;
+    }
+
+    /**
+     * @return upd_user
+     */
+    public String getUpdUser() {
+        return updUser;
+    }
+
+    /**
+     * @param updUser
+     */
+    public void setUpdUser(String updUser) {
+        this.updUser = updUser;
+    }
+
+    /**
+     * @return upd_name
+     */
+    public String getUpdName() {
+        return updName;
+    }
+
+    /**
+     * @param updName
+     */
+    public void setUpdName(String updName) {
+        this.updName = updName;
+    }
+
+    /**
+     * @return upd_host
+     */
+    public String getUpdHost() {
+        return updHost;
+    }
+
+    /**
+     * @param updHost
+     */
+    public void setUpdHost(String updHost) {
+        this.updHost = updHost;
+    }
+
+    public Integer getDataAll() {
+        return dataAll;
+    }
+
+    public void setDataAll(Integer dataAll) {
+        this.dataAll = dataAll;
+    }
+
+    public String getDataZone() {
+        return dataZone;
+    }
+
+    public void setDataZone(String dataZone) {
+        this.dataZone = dataZone;
+    }
+
+    public String getDataCompany() {
+        return dataCompany;
+    }
+
+    public void setDataCompany(String dataCompany) {
+        this.dataCompany = dataCompany;
+    }
+
+    /**
+     * @return attr1
+     */
+    public String getAttr1() {
+        return attr1;
+    }
+
+    /**
+     * @param attr1
+     */
+    public void setAttr1(String attr1) {
+        this.attr1 = attr1;
+    }
+
+    /**
+     * @return attr2
+     */
+    public String getAttr2() {
+        return attr2;
+    }
+
+    /**
+     * @param attr2
+     */
+    public void setAttr2(String attr2) {
+        this.attr2 = attr2;
+    }
+
+    /**
+     * @return attr3
+     */
+    public String getAttr3() {
+        return attr3;
+    }
+
+    /**
+     * @param attr3
+     */
+    public void setAttr3(String attr3) {
+        this.attr3 = attr3;
+    }
+
+    /**
+     * @return attr4
+     */
+    public String getAttr4() {
+        return attr4;
+    }
+
+    /**
+     * @param attr4
+     */
+    public void setAttr4(String attr4) {
+        this.attr4 = attr4;
+    }
+
+    /**
+     * @return attr5
+     */
+    public String getAttr5() {
+        return attr5;
+    }
+
+    /**
+     * @param attr5
+     */
+    public void setAttr5(String attr5) {
+        this.attr5 = attr5;
+    }
+
+    /**
+     * @return attr6
+     */
+    public String getAttr6() {
+        return attr6;
+    }
+
+    /**
+     * @param attr6
+     */
+    public void setAttr6(String attr6) {
+        this.attr6 = attr6;
+    }
+
+    /**
+     * @return attr7
+     */
+    public String getAttr7() {
+        return attr7;
+    }
+
+    /**
+     * @param attr7
+     */
+    public void setAttr7(String attr7) {
+        this.attr7 = attr7;
+    }
+
+    /**
+     * @return attr8
+     */
+    public String getAttr8() {
+        return attr8;
+    }
+
+    /**
+     * @param attr8
+     */
+    public void setAttr8(String attr8) {
+        this.attr8 = attr8;
+    }
+
+
+}
\ No newline at end of file