Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-29 2ac80d588a68f60084d8bcc02aabd18c91100267

 src/main/java/com/moral/service/impl/AreaServiceImpl.java

@@ -48,7 +48,7 @@
     * @return
     */
    @Override
    public String selectFullNameByCode(Integer code){
    public String queryFullNameByCode(Integer code){
        String codeStr = code.toString();
        String fullName = "";
        // 此时为地区code