Browse Source

console User表字段与service同步

dongbw 8 years ago
parent
commit
659b67f8e7

+ 64 - 12
donate-console/src/main/java/com/uas/console/donate/model/User.java

@@ -9,29 +9,57 @@ public class User implements Serializable{
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 用户uu号
+     */
     @Id
     @GeneratedValue(strategy= GenerationType.IDENTITY)
-    @Column(name="user_id")
-    private  Long id;
+    @Column(name = "user_uu")
+    private Long userUU;
 
+    /**
+     * 用户名
+     */
     @Column(name = "user_name")
     private String name;
 
+    /**
+     * 用户密码
+     */
+    @Column(name = "user_pwd")
+    private String pwd;
+
+    /**
+     * 用户手机号
+     */
     @Column(name = "user_tel")
     private Long tel;
 
     @Column(name = "user_identity")
     private Integer identity;
 
-    @Column(name = "user_uu")
-    private Long userUU;
+    /**
+     * 用户在的公司
+     */
+    @Column(name = "user_company")
+    private String company;
+
+    @Column(name = "user_imid")
+    private Long userIMId;
+
+    /**
+     *用户所属类型
+     */
+    @Column(name = "user_type")
+    private String type;
 
-    public Long getId() {
-        return id;
+
+    public Long getUserUU() {
+        return userUU;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setUserUU(Long userUU) {
+        this.userUU = userUU;
     }
 
     public String getName() {
@@ -42,6 +70,14 @@ public class User implements Serializable{
         this.name = name;
     }
 
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
     public Long getTel() {
         return tel;
     }
@@ -58,11 +94,27 @@ public class User implements Serializable{
         this.identity = identity;
     }
 
-    public Long getUserUU() {
-        return userUU;
+    public String getCompany() {
+        return company;
     }
 
-    public void setUserUU(Long userUU) {
-        this.userUU = userUU;
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public Long getUserIMId() {
+        return userIMId;
+    }
+
+    public void setUserIMId(Long userIMId) {
+        this.userIMId = userIMId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
     }
 }

+ 20 - 0
donate-console/src/main/webapp/WEB-INF/views/index.html

@@ -168,6 +168,26 @@
             data.content && (window.location.href = data.content);
         });
     });
+
+    $(document).ready(function() {
+        var btn = document.getElementsByClassName('dropdown-toggle');
+        console.log(btn.length);
+        for (var i = 0; i < btn.length; i++) {
+            console.log(btn);
+            var sib = btn[i].nextElementSibling;
+            var flag = true;
+            console.log(btn[i].nextElementSibling);
+            btn[i].onclick = function () {
+                if (flag) {
+                    sib.style.display = 'none';
+                    flag = false
+                } else {
+                    sib.style.display = 'block';
+                    flag = true
+                }
+            }
+        }
+    });
 </script>
 </body>
 </html>