Merge branch 'invtie_ep' into pre

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/EquipmentController.java

@@ -105,7 +105,7 @@ public class EquipmentController {
 		}
 		BigDecimal money = verifyRecord.getMoney();
 		String img = verifyRecord.getImg();
-		if (StrUtil.isNotBlank(img)) {
+		if (StrUtil.isEmpty(img)) {
 			throw BusinessRuntimeException.getInstance("转账截图不为空");
 		}
 		if (money == null) {