Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/dto/menuCatalog/MenuCatalogDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.menuCatalog;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,12 @@ import java.util.Date;
 public class MenuCatalogDto extends PageDto implements Serializable {
 
     private String storeType;
-private String caId;
-private String name;
-private String icon;
-private String seq;
-private String url;
-private String isShow;
+    private String caId;
+    private String name;
+    private String icon;
+    private String seq;
+    private String url;
+    private String isShow;
 
 
     private Date createTime;
@@ -31,43 +32,56 @@ private String isShow;
     public String getStoreType() {
         return storeType;
     }
-public void setStoreType(String storeType) {
+
+    public void setStoreType(String storeType) {
         this.storeType = storeType;
     }
-public String getCaId() {
+
+    public String getCaId() {
         return caId;
     }
-public void setCaId(String caId) {
+
+    public void setCaId(String caId) {
         this.caId = caId;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getIcon() {
+
+    public String getIcon() {
         return icon;
     }
-public void setIcon(String icon) {
+
+    public void setIcon(String icon) {
         this.icon = icon;
     }
-public String getSeq() {
+
+    public String getSeq() {
         return seq;
     }
-public void setSeq(String seq) {
+
+    public void setSeq(String seq) {
         this.seq = seq;
     }
-public String getUrl() {
+
+    public String getUrl() {
         return url;
     }
-public void setUrl(String url) {
+
+    public void setUrl(String url) {
         this.url = url;
     }
-public String getIsShow() {
+
+    public String getIsShow() {
         return isShow;
     }
-public void setIsShow(String isShow) {
+
+    public void setIsShow(String isShow) {
         this.isShow = isShow;
     }
 

java110-interface/src/main/java/com/java110/intf/community/IMenuInnerServiceSMO.java

@@ -74,6 +74,18 @@ public interface IMenuInnerServiceSMO {
 
 
 
+
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param routeDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/checkUserHasResource", method = RequestMethod.POST)
+    List<Map> checkUserHasResource(@RequestBody BasePrivilegeDto routeDto);
+
+
     /**
      * <p>查询小区楼信息</p>
      *
@@ -92,17 +104,6 @@ public interface IMenuInnerServiceSMO {
     @RequestMapping(value = "/queryBasePrivilegesCount", method = RequestMethod.POST)
     int queryBasePrivilegesCount(@RequestBody BasePrivilegeDto routeDto);
 
-
-    /**
-     * 查询<p>小区楼</p>总记录数
-     *
-     * @param routeDto 数据对象分享
-     * @return 小区下的小区楼记录数
-     */
-    @RequestMapping(value = "/checkUserHasResource", method = RequestMethod.POST)
-    List<Map> checkUserHasResource(@RequestBody BasePrivilegeDto routeDto);
-
-
     /**
      * <p>修改APP信息</p>
      *

service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java

@@ -84,6 +84,8 @@ public class PcUserLoginCmd extends Cmd {
         Assert.isJsonObject(paramIn, "用户注册请求参数有误，不是有效的json格式 " + paramIn);
         Assert.jsonObjectHaveKey(paramIn, "username", "用户登录，未包含username节点，请检查" + paramIn);
         Assert.jsonObjectHaveKey(paramIn, "passwd", "用户登录，未包含passwd节点，请检查" + paramIn);
+
+
     }
 
     @Override