{"push_id":2587222744,"size":2,"distinct_size":1,"ref":"refs/heads/feature/index","head":"0bcaf2ee9903190b70bdeda23414407bab1aed3f","before":"0853594ed93f99895e7bc1668449b5ca4d98a4eb","commits":[{"sha":"a80e57558f361ee361e533429f1dc4ff3bfc12f2","author":{"name":"s15863549041@126.com","email":"3ee14214f7744182b19b2aab85a53d65eb304663@126.com"},"message":"permission","distinct":false,"url":"https://api.github.com/repos/2301887641/clients/commits/a80e57558f361ee361e533429f1dc4ff3bfc12f2"},{"sha":"0bcaf2ee9903190b70bdeda23414407bab1aed3f","author":{"name":"suiguozhen","email":"3dd2fdffe1bb19aeb5a4319aeb12522804081ef2@qq.com"},"message":"Merge remote-tracking branch 'origin/user' into feature/index\n\n# Conflicts:\n#\tuser-common/build.gradle\n#\tuser-dao/src/main/java/com/khcm/user/dao/entity/business/user/UserExt.java\n#\tuser-dao/src/main/java/com/khcm/user/dao/mapper/user/UserMapper.java\n#\tuser-dao/src/main/resources/mapper/user/UserMapper.xml\n#\tuser-service/service-api/src/main/java/com/khcm/user/service/api/business/user/UserService.java\n#\tuser-service/service-api/src/main/java/com/khcm/user/service/dto/business/user/UserDTO.java\n#\tuser-service/service-impl/src/main/java/com/khcm/user/service/converter/business/user/UserConverter.java\n#\tuser-service/service-impl/src/main/java/com/khcm/user/service/impl/business/user/UserServiceImpl.java\n#\tuser-web/web-admin/src/main/java/com/khcm/user/web/admin/config/shiro/ShiroConfig.java\n#\tuser-web/web-admin/src/main/java/com/khcm/user/web/admin/controller/user/UserController.java\n#\tuser-web/web-admin/src/main/resources/static/js/business/addAndEdit.js\n#\tuser-web/web-admin/src/main/resources/static/js/business/user/user/add.js\n#\tuser-web/web-admin/src/main/resources/templates/business/user/user/add.html\n#\tuser-web/web-admin/src/main/resources/templates/business/user/user/index.html\n#\tuser-web/web-admin/src/main/resources/templates/business/user/user/info.html\n#\tuser-web/web-common/src/main/java/com/khcm/user/web/common/handler/UnificationExceptionHandler.java\n#\tuser-web/web-common/src/main/java/com/khcm/user/web/common/utils/security/SecurityUtil.java","distinct":true,"url":"https://api.github.com/repos/2301887641/clients/commits/0bcaf2ee9903190b70bdeda23414407bab1aed3f"}]}
{"actor":{"display_login":"2301887641"}}