Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

 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