Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/common/utils/CodeGenerationUtils.java

@@ -100,6 +100,7 @@ public class CodeGenerationUtils {
             String s = jdbcTemplate.queryForObject(sql, String.class);
             return applyNumberPattern.substring(0, 3) + (Long.parseLong(s) + 1);
         } catch (Exception e) {
+            logger.error("流水号生成失败", e);
             return applyNumberPattern + "0001";
         } finally {
             lock.unlock();